diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 00161b9..827eddf 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -147,3 +147,4 @@ background:44F; @import 'galleries'; @import 'tinymce'; +@import 'linkboxes'; \ No newline at end of file diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 0eb9e1b..2fb10ff 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -44,98 +44,6 @@ a:hover { -ul.linkbox-list -{ - max-width:70em; -margin-left:auto; -margin-right:auto; -} -a.linkbox, div.contentbox -{ - display:block; - padding:5px; - border-radius:$box-border-radius; - border: $box-border; - background: $box-background; -} - - -a.linkbox:hover -{ -box-shadow: 1px 1px 2px 2px lightgray; -} - -a.linkbox.color-1 -{ -color:$color_schema_1; -} -a.linkbox.color-2 -{ -color:$color_schema_2; -} -a.linkbox.color-3 -{ -color:$color_schema_3; -} -a.linkbox.color-4 -{ -color:$color_schema_4; -} -a.linkbox.color-5 -{ -color:$color_schema_5; -} - -a.color-1-dark -{ -color:$color_schema_1_dark; -} -a.color-2-dark -{ -color:$color_schema_2_dark; -} -a.color-3-dark -{ -color:$color_schema_3_dark; -} -a.color-4-dark -{ -color:$color_schema_4_dark; -} -a.color-5-dark -{ -color:$color_schema_5_dark; -} -a.color-1-dark:hover -{ -color:$color_schema_1; -} -a.color-2-dark:hover -{ -color:$color_schema_2; -} -a.color-3-dark:hover -{ -color:$color_schema_3; -} -a.color-4-dark:hover -{ -color:$color_schema_4; -} -a.color-5-dark:hover -{ -color:$color_schema_5; -} - - -a.linkbox li -{ -} -ul.linkbox-list li -{ -margin-bottom:10px; -} - div.contentbox { margin: 5px; @@ -175,28 +83,6 @@ div.smallspan { min-height:0; } -ul.linklist -{max-width:100%; -padding:0; -margin:5px; -} -ul.linklist li{ -list-style:none; -margin-bottom:2px; -} -ul.linklist li a i{ -vertical-align:middle; -margin-right:6px; -font-size:2em;} -span.linklist a { - padding:5px; - border-radius:$box-border-radius; - border: $box-border; - background: $box-background; - display:block; - float:left; - -} form.inline div { float:left;} diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index fdc57b0..6d7bd7e 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/app/assets/stylesheets/themes/blue1/application.css.scss @@ -117,5 +117,6 @@ $box-border-radius:0px; $box-background: white; @import 'layout'; +@import 'linkboxes'; @import 'calendars'; @import 'formtastic-bootstrap' \ No newline at end of file diff --git a/app/assets/stylesheets/themes/blue1/linkboxes.css.scss b/app/assets/stylesheets/themes/blue1/linkboxes.css.scss new file mode 100644 index 0000000..15bb687 --- /dev/null +++ b/app/assets/stylesheets/themes/blue1/linkboxes.css.scss @@ -0,0 +1,61 @@ +ul.linkbox-list +{ + max-width:70em; + margin-left:auto; + margin-right:auto; +} +a.linkbox, div.contentbox +{ + display:block; + padding:5px; + border-radius:$box-border-radius; + border: $box-border; + background: $box-background; +} + +a.linkbox:hover{ box-shadow: 1px 1px 2px 2px lightgray; } + +a.linkbox.color-1 { color:$color_schema_1; } +a.linkbox.color-2 { color:$color_schema_2; } +a.linkbox.color-3 { color:$color_schema_3; } +a.linkbox.color-4 { color:$color_schema_4;} +a.linkbox.color-5 { color:$color_schema_5;} + +a.color-1-dark { color:$color_schema_1_dark; } +a.color-2-dark { color:$color_schema_2_dark; } +a.color-3-dark { color:$color_schema_3_dark;} +a.color-4-dark { color:$color_schema_4_dark;} +a.color-5-dark { color:$color_schema_5_dark;} +a.color-1-dark:hover { color:$color_schema_1; } +a.color-2-dark:hover { color:$color_schema_2; } +a.color-3-dark:hover { color:$color_schema_3; } +a.color-4-dark:hover { color:$color_schema_4; } +a.color-5-dark:hover { color:$color_schema_5; } + +a.linkbox li { } +ul.linkbox-list li { + margin-bottom:10px; +} +ul.linklist { + max-width:100%; + padding:0; + margin:5px; +} +ul.linklist li { + list-style:none; + margin-bottom:2px; +} +ul.linklist li a i{ + vertical-align:middle; + margin-right:6px; + font-size:2em;} +span.linklist a { + padding:5px; + border-radius:$box-border-radius; + border: $box-border; + background: $box-background; + display:block; + float:left; + +} + diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss index 1db0ed0..dfecb6a 100755 --- a/app/assets/stylesheets/themes/blue2/application.css.scss +++ b/app/assets/stylesheets/themes/blue2/application.css.scss @@ -1,4 +1,6 @@ +/* This is the main file for theme "blue2" + */ /* * This is a manifest file that'll be compiled into application.css, which will include all the files * listed below. @@ -89,9 +91,11 @@ div.header { height:45px; margin-bottom: 0 px } + div.header_span { background:white } + div.header h1 { padding:0; margin:4px; @@ -117,13 +121,13 @@ $navbar-li-minwidth: 0; $box-border: lightgray solid 1px; -$box-border-radius:4px; +$box-border-radius:6px; $box-background: white; @import 'layout'; @import 'calendars'; @import 'formtastic-bootstrap'; - +@import 'linkboxes'; @import 'extra'; body { background: #FFF; //#EFEFEF; diff --git a/app/assets/stylesheets/themes/blue2/linkboxes.css.scss b/app/assets/stylesheets/themes/blue2/linkboxes.css.scss new file mode 100644 index 0000000..789e94f --- /dev/null +++ b/app/assets/stylesheets/themes/blue2/linkboxes.css.scss @@ -0,0 +1,84 @@ +ul.linkbox-list +{ + max-width:70em; + margin-left:auto; + margin-right:auto; +} + +ul.linkbox-list > li { + margin-bottom:0px; +} + +ul.linkbox-list > li:first-child a.linkbox { + border-top-left-radius:$box-border-radius; + border-top-right-radius:$box-border-radius; + border: $box-border; + +} + +ul.linkbox-list > li:last-child a.linkbox { + border-bottom-left-radius:$box-border-radius; + border-bottom-right-radius:$box-border-radius; +} + +ul.linkbox-list > li a.linkbox { + border-radius: 0; + border-top: none; + +} + +ul.linkbox-list > li a.linkbox:hover { + z-index:2000 +} +a.linkbox, div.contentbox +{ + display:block; + padding:5px; + border-radius:$box-border-radius; + border: $box-border; + background: $box-background; +} + +a.linkbox:hover{ box-shadow: 1px 1px 2px 2px lightgray; } + +a.linkbox.color-1 { color:$color_schema_1; } +a.linkbox.color-2 { color:$color_schema_2; } +a.linkbox.color-3 { color:$color_schema_3; } +a.linkbox.color-4 { color:$color_schema_4;} +a.linkbox.color-5 { color:$color_schema_5;} + +a.color-1-dark { color:$color_schema_1_dark; } +a.color-2-dark { color:$color_schema_2_dark; } +a.color-3-dark { color:$color_schema_3_dark;} +a.color-4-dark { color:$color_schema_4_dark;} +a.color-5-dark { color:$color_schema_5_dark;} +a.color-1-dark:hover { color:$color_schema_1; } +a.color-2-dark:hover { color:$color_schema_2; } +a.color-3-dark:hover { color:$color_schema_3; } +a.color-4-dark:hover { color:$color_schema_4; } +a.color-5-dark:hover { color:$color_schema_5; } + +a.linkbox li { } +ul.linklist { + max-width:100%; + padding:0; + margin:5px; +} +ul.linklist li { + list-style:none; + margin-bottom:2px; +} +ul.linklist li a i{ + vertical-align:middle; + margin-right:6px; + font-size:2em;} +span.linklist a { + padding:5px; + border-radius:$box-border-radius; + border: $box-border; + background: $box-background; + display:block; + float:left; + +} + diff --git a/app/views/themes/blue2/home/index.html.erb b/app/views/themes/blue2/home/index.html.erb index 481b871..0b9527b 100644 --- a/app/views/themes/blue2/home/index.html.erb +++ b/app/views/themes/blue2/home/index.html.erb @@ -46,7 +46,7 @@