From 76d7278c0a49bd60f6ff521aef458be658c04b47 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 3 Jun 2015 13:57:10 +0200 Subject: empty php schema back --- view/theme/redbasic/schema/simple_white_on_black.php | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 view/theme/redbasic/schema/simple_white_on_black.php (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php new file mode 100644 index 000000000..c306be720 --- /dev/null +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -0,0 +1,2 @@ + Date: Wed, 3 Jun 2015 15:45:50 +0200 Subject: 2 more schemas in new format --- .../redbasic/schema/simple_black_on_white.css | 245 +++++++++++++++++++- .../redbasic/schema/simple_black_on_white.php | 111 ---------- .../redbasic/schema/simple_green_on_black.css | 246 ++++++++++++++++++++- .../redbasic/schema/simple_green_on_black.php | 110 --------- 4 files changed, 473 insertions(+), 239 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index dd47a3280..2ecd9fac0 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -1,13 +1,6 @@ -.vcard { - border-bottom: 1px solid #fff; -} - -#contact-block { - border-bottom: 1px solid #fff; -} - -.widget { +.vcard, #contact-block, .widget { border-bottom: 1px solid #fff; + background-color: rgba(255,255,255,0.4); } .abook-pending-contact, .abook-permschange { @@ -150,3 +143,237 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ nav .dropdown-menu { background-color: #fff; } + +.rconnect { + color: #000; + background-color: #fff; +} + +a.rateme, div.rateme { + color: #000; + background-color: #fff; + border: 1px solid #fff; +} + +a.rconnect, a.rateme, div.rateme { + color: #000; +} + +.navbar-inverse { + background-image: -webkit-linear-gradient(top, #fff 0%, #fff 100%); + background-image: linear-gradient(to bottom, #fff 0%, #fff 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fff, endColorstr=#fff, GradientType=0); + background-color: #fff; + border-color: #fff; +} + +.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-toggle { + border-color: #fff; +} + +.navbar-inverse .navbar-nav > .active > a { + background-image: -webkit-linear-gradient(top, #fff 0%, #fff 100%); + background-image: linear-gradient(to bottom, #fff 0%, #fff 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fff, endColorstr=#fff, GradientType=0); +} + +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus { + background-color: #fff; + color: #000; +} + +.navbar-inverse .navbar-toggle:hover, +.navbar-inverse .navbar-toggle:focus { + background-color: #fff; +} + +#nav-search-text { + border-color: #fff; + background-color: #F5F5F5; +} + +.autocomplete .selected { + background: #F5F5F5; +} + +#nav-search-text-ac .autocomplete { + border: 1px solid #fff; +} + +#usermenu-caret, .navbar-inverse .navbar-nav > li > a { + color: #111; +} + +.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs { + color: #000; +} + +.nav-tabs{ + border-bottom:1px solid #000; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid #000; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { + color: #000; + background-color: #fff; +} + +.nav-tabs.nav-justified > li > a { + color: #000; +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: underline; + background-color: #fff; + color: #000; +} + +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: underline; + background-color: #F5F5F5; +} + +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: bold; + color: #000; +} + +a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { + color: #000; +} + +.divgrow-showmore { + color: #000; +} + +.field.checkbox:hover > div label { + border-color: #000; +} + +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { + color: #000 !important; + text-decoration: underline !important; +} + +header #banner { + color: #fff; +} + +body { + background-color: #fff; + color: #000; +} + +.jothidden > input { + border: 1px solid #fff; + background-color: #fff; +} + +.jothidden .bootstrap-tagsinput { + border-color: #fff; + background-color: #fff; +} + +.generic-content-wrapper-styled { + background-color: rgba(255,255,255,0.8); +} + +.wall-item-content-wrapper.comment, .hide-comments-outer { + background-color: rgba(255,255,255,0.4); + border-color: rgba(255,255,255,0.8); +} + +#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td, +[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after { + background-color: rgba(255,255,255,0.8); +} + +.onoffswitch-inner:before { + background-color: rgba(255,255,255,0.8); + color: #000; +} + +.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np { + background-color: rgba(255,255,255,0.4); +} + +.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 { + color: #111; +} + +.profile-import input { + color: #000; +} + +.autocomplete { + color: #000; + background: #fff; +} + +blockquote { + background-color: #fff; + border-left: 3px solid #000; + color: #111; +} + +code { + border: 1px solid #000; + background: #fff; + color: #000; +} + +pre { + background: #fff; + color: #111; + border:1px solid #000; +} + +.notif-item a { + color: #000; +} + +.notif-item a:hover { + color: #000; +} + +.dropdown-menu { + background-color: #fff; +} + +.dropdown-menu >li > a { + color: #000; +} + +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: #000; + background-color: #F5F5F5; + background-image: none; +} + +.open .dropdown-toggle.btn-default { + color: #000; + background-color: #fff; + border-color: #fff; +} + +.preview { + background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); +} + + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #000; + } +} + +@media screen and (max-width: 767px) { + aside#region_1 { + border-right: 1px solid #fff; + } + } diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 7c1c99a32..c306be720 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -1,113 +1,2 @@ li>a:hover,nav .dropdown-menu>li>a:focus{ nav .dropdown-menu { background-color: #000; } + +.rconnect { + color: #50f148; + background-color: #000; +} + +a.rateme, div.rateme { + color: #50f148; + background-color: #000; + border: 1px solid #000; +} + +a.rconnect, a.rateme, div.rateme { + color: #50f148; +} + +.navbar-inverse { + background-image: -webkit-linear-gradient(top, #000 0%, #000 100%); + background-image: linear-gradient(to bottom, #000 0%, #000 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0); + background-color: #000; + border-color: #000; +} + +.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-toggle { + border-color: #000; +} + +.navbar-inverse .navbar-nav > .active > a { + background-image: -webkit-linear-gradient(top, #000 0%, #000 100%); + background-image: linear-gradient(to bottom, #000 0%, #000 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0); +} + +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus { + background-color: #000; + color: #50f148; +} + +.navbar-inverse .navbar-toggle:hover, +.navbar-inverse .navbar-toggle:focus { + background-color: #000; +} + +#nav-search-text { + border-color: #000; + background-color: #000; +} + +.autocomplete .selected { + background: #000; +} + +#nav-search-text-ac .autocomplete { + border: 1px solid #000; +} + +#usermenu-caret, .navbar-inverse .navbar-nav > li > a { + color: #32962D; +} + +.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs { + color: #50f148; +} + +.nav-tabs{ + border-bottom:1px solid #143D12; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid #143D12; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { + color: #46D43F; + background-color: #000; +} + +.nav-tabs.nav-justified > li > a { + color: #50f148; +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: underline; + background-color: #000; + color: #50f148; +} + +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: underline; + background-color: #143D12; +} + +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: bold; + color: #50f148; +} + +a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { + color: #50f148; +} + +.divgrow-showmore { + color: #50f148; +} + +.field.checkbox:hover > div label { + border-color: #50f148; +} + +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { + color: #50f148 !important; + text-decoration: underline !important; +} + +header #banner { + color: #000; +} + +body { + background-color: #000; + color: #46D43F; +} + +.jothidden > input { + border: 1px solid #000; + background-color: #000; +} + +.jothidden .bootstrap-tagsinput { + border-color: #000; + background-color: #000; +} + +.generic-content-wrapper-styled { + background-color: rgba(0,0,0,0.8); +} + +.wall-item-content-wrapper.comment, .hide-comments-outer { + background-color: rgba(0,0,0,0.4); + border-color: rgba(0,0,0,0.8); +} + +#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td, +[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after { + background-color: rgba(0,0,0,0.8); +} + +.onoffswitch-inner:before { + background-color: rgba(0,0,0,0.8); + color: #46D43F; +} + +.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np { + background-color: rgba(0,0,0,0.4); +} + +.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 { + color: #32962D; +} + +.profile-import input { + color: #46D43F; +} + +.autocomplete { + color: #46D43F; + background: #000; +} + +blockquote { + background-color: #000; + border-left: 3px solid #143D12; + color: #32962D; +} + +code { + border: 1px solid #143D12; + background: #000; + color: #32962D; +} + +pre { + background: #000; + color: #32962D; + border:1px solid #143D12; +} + +.notif-item a { + color: #50f148; +} + +.notif-item a:hover { + color: #50f148; +} + +.dropdown-menu { + background-color: #000; +} + +.dropdown-menu >li > a { + color: #32962D; +} + +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: #50f148; + background-color: #143D12; + background-image: none; +} + +.open .dropdown-toggle.btn-default { + color: #50f148; + background-color: #000; + border-color: #143D12; +} + +.preview { + background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); +} + + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #143D12; + } +} + +@media screen and (max-width: 767px) { + aside#region_1 { + border-right: 1px solid #000; + } + } diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 6b104a4e6..4f4bb7426 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -1,115 +1,5 @@ Date: Wed, 3 Jun 2015 22:53:48 +0200 Subject: Schemas: should be ok now. --- view/theme/redbasic/css/style.css | 6 +- .../redbasic/schema/simple_black_on_white.css | 114 +-------------------- .../redbasic/schema/simple_black_on_white.php | 37 +++++++ .../redbasic/schema/simple_green_on_black.css | 113 +------------------- .../redbasic/schema/simple_green_on_black.php | 45 ++++++-- .../redbasic/schema/simple_white_on_black.css | 109 +------------------- .../redbasic/schema/simple_white_on_black.php | 34 ++++++ 7 files changed, 116 insertions(+), 342 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 83b10b527..8edb06a3e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1506,6 +1506,7 @@ margin-right: 50px; .admin-icons { font-size: 1.2em; color: $toolicon_colour; + margin-right: 10px; } a .drop-icons { @@ -1548,11 +1549,6 @@ a .drop-icons:hover { list-style-type: none; } -.admin-icons { - color: $toolicon_colour; - margin-right: 10px; -} - #adminpage table tr:hover { background-color: #BBC7D7; } diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 2ecd9fac0..2fdc46413 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -1,6 +1,5 @@ .vcard, #contact-block, .widget { border-bottom: 1px solid #fff; - background-color: rgba(255,255,255,0.4); } .abook-pending-contact, .abook-permschange { @@ -129,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ background-image: none; } - nav .dropdown-menu .divider{ background-color: #F5F5F5; } @@ -146,51 +144,24 @@ nav .dropdown-menu { .rconnect { color: #000; - background-color: #fff; } a.rateme, div.rateme { color: #000; - background-color: #fff; border: 1px solid #fff; } a.rconnect, a.rateme, div.rateme { - color: #000; -} - -.navbar-inverse { - background-image: -webkit-linear-gradient(top, #fff 0%, #fff 100%); - background-image: linear-gradient(to bottom, #fff 0%, #fff 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fff, endColorstr=#fff, GradientType=0); - background-color: #fff; - border-color: #fff; -} - -.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-toggle { - border-color: #fff; -} - -.navbar-inverse .navbar-nav > .active > a { - background-image: -webkit-linear-gradient(top, #fff 0%, #fff 100%); - background-image: linear-gradient(to bottom, #fff 0%, #fff 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fff, endColorstr=#fff, GradientType=0); + color: #000; } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - background-color: #fff; color: #000; } -.navbar-inverse .navbar-toggle:hover, -.navbar-inverse .navbar-toggle:focus { - background-color: #fff; -} - #nav-search-text { - border-color: #fff; background-color: #F5F5F5; } @@ -198,18 +169,6 @@ a.rconnect, a.rateme, div.rateme { background: #F5F5F5; } -#nav-search-text-ac .autocomplete { - border: 1px solid #fff; -} - -#usermenu-caret, .navbar-inverse .navbar-nav > li > a { - color: #111; -} - -.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs { - color: #000; -} - .nav-tabs{ border-bottom:1px solid #000; } @@ -228,8 +187,8 @@ a.rconnect, a.rateme, div.rateme { } .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #fff; + text-decoration: underline; + background-color: #fff; color: #000; } @@ -240,19 +199,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #000; -} - -a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { - color: #000; -} - -.divgrow-showmore { - color: #000; -} - -.field.checkbox:hover > div label { - border-color: #000; } .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { @@ -260,58 +206,11 @@ a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { text-decoration: underline !important; } -header #banner { - color: #fff; -} - -body { - background-color: #fff; - color: #000; -} - -.jothidden > input { - border: 1px solid #fff; - background-color: #fff; -} - -.jothidden .bootstrap-tagsinput { - border-color: #fff; - background-color: #fff; -} - .generic-content-wrapper-styled { background-color: rgba(255,255,255,0.8); } -.wall-item-content-wrapper.comment, .hide-comments-outer { - background-color: rgba(255,255,255,0.4); - border-color: rgba(255,255,255,0.8); -} - -#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td, -[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after { - background-color: rgba(255,255,255,0.8); -} - -.onoffswitch-inner:before { - background-color: rgba(255,255,255,0.8); - color: #000; -} - -.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np { - background-color: rgba(255,255,255,0.4); -} - -.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 { - color: #111; -} - -.profile-import input { - color: #000; -} - .autocomplete { - color: #000; background: #fff; } @@ -365,15 +264,10 @@ pre { background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); } - @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #000; } } -@media screen and (max-width: 767px) { - aside#region_1 { - border-right: 1px solid #fff; - } - } + diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index c306be720..6853a0ed5 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -1,2 +1,39 @@ .active > a { - background-image: -webkit-linear-gradient(top, #000 0%, #000 100%); - background-image: linear-gradient(to bottom, #000 0%, #000 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0); + color: #50f148; } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - background-color: #000; color: #50f148; } -.navbar-inverse .navbar-toggle:hover, -.navbar-inverse .navbar-toggle:focus { - background-color: #000; -} - #nav-search-text { - border-color: #000; background-color: #000; } @@ -199,18 +170,6 @@ a.rconnect, a.rateme, div.rateme { background: #000; } -#nav-search-text-ac .autocomplete { - border: 1px solid #000; -} - -#usermenu-caret, .navbar-inverse .navbar-nav > li > a { - color: #32962D; -} - -.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs { - color: #50f148; -} - .nav-tabs{ border-bottom:1px solid #143D12; } @@ -229,8 +188,8 @@ a.rconnect, a.rateme, div.rateme { } .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #000; + text-decoration: underline; + background-color: #000; color: #50f148; } @@ -241,19 +200,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #50f148; -} - -a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { - color: #50f148; -} - -.divgrow-showmore { - color: #50f148; -} - -.field.checkbox:hover > div label { - border-color: #50f148; } .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { @@ -261,58 +207,11 @@ a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { text-decoration: underline !important; } -header #banner { - color: #000; -} - -body { - background-color: #000; - color: #46D43F; -} - -.jothidden > input { - border: 1px solid #000; - background-color: #000; -} - -.jothidden .bootstrap-tagsinput { - border-color: #000; - background-color: #000; -} - .generic-content-wrapper-styled { background-color: rgba(0,0,0,0.8); } -.wall-item-content-wrapper.comment, .hide-comments-outer { - background-color: rgba(0,0,0,0.4); - border-color: rgba(0,0,0,0.8); -} - -#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td, -[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after { - background-color: rgba(0,0,0,0.8); -} - -.onoffswitch-inner:before { - background-color: rgba(0,0,0,0.8); - color: #46D43F; -} - -.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np { - background-color: rgba(0,0,0,0.4); -} - -.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 { - color: #32962D; -} - -.profile-import input { - color: #46D43F; -} - .autocomplete { - color: #46D43F; background: #000; } @@ -373,8 +272,4 @@ pre { } } -@media screen and (max-width: 767px) { - aside#region_1 { - border-right: 1px solid #000; - } - } + diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 4f4bb7426..2660624d6 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -1,13 +1,36 @@ .active > a { - background-image: -webkit-linear-gradient(top, #000 0%, #000 100%); - background-image: linear-gradient(to bottom, #000 0%, #000 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0); + color: #fff; } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - background-color: #000; color: #fff; } -.navbar-inverse .navbar-toggle:hover, -.navbar-inverse .navbar-toggle:focus { - background-color: #000; -} - #nav-search-text { - border-color: #000; background-color: #000; } @@ -197,18 +169,6 @@ a.rconnect, a.rateme, div.rateme { background: #000; } -#nav-search-text-ac .autocomplete { - border: 1px solid #000; -} - -#usermenu-caret, .navbar-inverse .navbar-nav > li > a { - color: #eee; -} - -.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs { - color: #fff; -} - .nav-tabs{ border-bottom:1px solid #fff; } @@ -239,19 +199,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #fff; -} - -a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { - color: #fff; -} - -.divgrow-showmore { - color: #fff; -} - -.field.checkbox:hover > div label { - border-color: #fff; } .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { @@ -259,58 +206,11 @@ a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label { text-decoration: underline !important; } -header #banner { - color: #000; -} - -body { - background-color: #000; - color: #fff; -} - -.jothidden > input { - border: 1px solid #000; - background-color: #000; -} - -.jothidden .bootstrap-tagsinput { - border-color: #000; - background-color: #000; -} - .generic-content-wrapper-styled { background-color: rgba(0,0,0,0.8); } -.wall-item-content-wrapper.comment, .hide-comments-outer { - background-color: rgba(0,0,0,0.4); - border-color: rgba(0,0,0,0.8); -} - -#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td, -[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after { - background-color: rgba(0,0,0,0.8); -} - -.onoffswitch-inner:before { - background-color: rgba(0,0,0,0.8); - color: #fff; -} - -.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np { - background-color: rgba(0,0,0,0.4); -} - -.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 { - color: #eee; -} - -.profile-import input { - color: #fff; -} - .autocomplete { - color: #fff; background: #000; } @@ -364,15 +264,10 @@ pre { background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); } - @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #fff; } } -@media screen and (max-width: 767px) { - aside#region_1 { - border-right: 1px solid #000; - } - } + diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index c306be720..a76709ac9 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -1,2 +1,36 @@ Date: Fri, 5 Jun 2015 21:15:21 +0200 Subject: More schemas in new format --- view/theme/redbasic/schema/dark.css | 123 +++++++++++++++++++-- view/theme/redbasic/schema/dark.php | 80 +------------- .../redbasic/schema/simple_black_on_white.css | 15 --- .../redbasic/schema/simple_white_on_black.css | 15 --- 4 files changed, 114 insertions(+), 119 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 78aa27d38..02ee4707e 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -1,13 +1,5 @@ -.vcard { - border-bottom: 1px solid #333; -} - -#contact-block { - border-bottom: 1px solid #333; -} - -.widget { - border-bottom: 1px solid #333; +.vcard, #contact-block, .widget { + border-bottom: 1px solid #fff; } .abook-pending-contact, .abook-permschange { @@ -136,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ background-image: none; } - nav .dropdown-menu .divider{ background-color: #222; } @@ -150,3 +141,113 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ nav .dropdown-menu { background-color: #000; } + +#nav-search-text { + background-color: #999; +} + +.autocomplete .selected { + background: #999; +} + +.nav-tabs{ + border-bottom:1px solid #333; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid #333; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { + color: #fff; + background-color: #111; +} + +.nav-tabs.nav-justified > li > a { + color: #ccc; +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: underline; + background-color: #222; + color: #ccc; +} + +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: underline; + background-color: #222; +} + +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: bold; +} + +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { + color: #fff !important; + text-decoration: underline !important; +} + +.generic-content-wrapper-styled { + background-color: rgba(28,28,28,0.8); +} + +.autocomplete { + background: #222; +} + +blockquote { + background-color: #1e1e1e; + border-left: 3px solid #666; + color: #ccc; +} + +code { + border: 1px solid #090909; + background: #000; + color: #fff; +} + +pre { + background: #000; + color: #fff; + border:1px solid #090909; +} + +.notif-item a { + color: #ccc; +} + +.notif-item a:hover { + color: #fff; +} + +.dropdown-menu { + background-color: #222; +} + +.dropdown-menu >li > a { + color: #ccc; +} + +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: #ddd; + background-color: #333; + background-image: none; +} + +.open .dropdown-toggle.btn-default { + color: #ccc; + background-color: #222; + border-color: #222; +} + +.preview { + background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); +} + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #333; + } +} + diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index b3addcfff..92e703325 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -16,42 +16,16 @@ $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; - if (! $navtabs_borderc) - $navtabs_borderc = "#333"; - if (! $navtabs_fontcolour) - $navtabs_fontcolour = "#fff"; - if (! $navtabs_bgcolour) - $navtabs_bgcolour = "#111"; - if (! $navtabs_linkcolour) - $navtabs_linkcolour = "color: #ccc;"; - if (! $navtabs_linkchover) - $navtabs_linkchover = "color: #fff;"; - if (! $navtabs_bgchover) - $navtabs_bgchover = "#222"; - if (! $navtabs_decohover) - $navtabs_decohover = "underline"; - if (! $navaside_bghover) - $navaside_bghover = "#222"; if (! $link_colour) $link_colour = "#fff"; - if (! $link_font_weight) - $link_font_weight = "bold"; - if (! $selected_active_colour) - $selected_active_colour = "#fff"; - if (! $selected_active_deco) - $selected_active_deco = "underline"; if (! $banner_colour) $banner_colour = "#999"; - if (! $search_background) - $search_background = "#999"; if (! $bgcolour) $bgcolour = "#111"; if (! $item_colour) $item_colour = "rgba(28,28,28,0.8)"; if (! $comment_item_colour) $comment_item_colour = "rgba(18,18,18,0.4)"; - if (! $genericcontent_bgcolour) - $genericcontent_bgcolour = "rgba(28,28,28,0.8)"; if (! $comment_border_colour) $comment_border_colour = "rgba(28,28,28,0.8)"; if (! $toolicon_colour) @@ -60,55 +34,5 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; - if (! $blockquote_colour) - $blockquote_colour = "#ccc"; - if (! $blockquote_bgcolour) - $blockquote_bgcolour = "#1e1e1e"; - if (! $blockquote_bordercolour) - $blockquote_bordercolour = "#666"; - if (! $code_borderc) - $code_borderc = "#090909"; - if (! $code_bgcolour) - $code_bgcolour = "#000"; - if (! $code_txtcolour) - $code_txtcolour = "#fff"; - if (! $pre_borderc) - $pre_borderc = "#090909"; - if (! $pre_bgcolour) - $pre_bgcolour = "#000"; - if (! $pre_txtcolour) - $pre_txtcolour = "#fff"; - if (! $item_bordercolour) - $item_bordercolour = "#333"; - if (! $notif_itemcolour) - $notif_itemcolour = "#ccc"; - if (! $notif_itemhovercolour) - $notif_itemhovercolour = "#fff"; - if (! $acpopup_bgcolour) - $acpopup_bgcolour = "#222"; - if (! $acpopup_bordercolour) - $acpopup_bordercolour = "#333"; - if (! $acpopup_tgbl_bgcolour) - $acpopup_tgbl_bgcolour = "#333"; - if (! $acpopup_hovercolour) - $acpopup_hovercolour = "#fff"; - if (! $editbuttons_bghover) - $editbuttons_bghover = "#222"; - if (! $dropdown_bgcolour) - $dropdown_bgcolour = "#222"; - if (! $dropdown_textcolour) - $dropdown_textcolour = "#ccc"; - if (! $dropdown_txtcolhover) - $dropdown_txtcolhover = "#ddd"; - if (! $dropdown_bgcolhover) - $dropdown_bgcolhover = "#333"; - if (! $dropdown_bgimghover) - $dropdown_bgimghover = "background-image: none;"; - if (! $dropdown_togglecol) - $dropdown_togglecol = "#ccc"; - if (! $dropdown_togglebgcol) - $dropdown_togglebgcol = "#222"; - if (! $dropdown_bordercol) - $dropdown_bordercol = "#222"; - if (! $preview_backgroundimg) - $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif"; + + diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 2fdc46413..c00f3c260 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -142,25 +142,10 @@ nav .dropdown-menu { background-color: #fff; } -.rconnect { - color: #000; -} - a.rateme, div.rateme { - color: #000; border: 1px solid #fff; } -a.rconnect, a.rateme, div.rateme { - color: #000; -} - -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - color: #000; -} - #nav-search-text { background-color: #F5F5F5; } diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index c9c95263c..3504265b9 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -142,25 +142,10 @@ nav .dropdown-menu { background-color: #000; } -.rconnect { - color: #fff; -} - a.rateme, div.rateme { - color: #fff; border: 1px solid #000; } -a.rconnect, a.rateme, div.rateme { - color: #fff; -} - -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - color: #fff; -} - #nav-search-text { background-color: #000; } -- cgit v1.2.3 From dff402293f7cadcb75b1646d13f70e8259ebefca Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 6 Jun 2015 15:06:27 +0200 Subject: some cleanup after scheme transition --- view/theme/redbasic/css/style.css | 98 +++++++------------------------ view/theme/redbasic/php/style.php | 117 -------------------------------------- 2 files changed, 19 insertions(+), 196 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8edb06a3e..8f70d469a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -70,7 +70,7 @@ abbr { } a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { - font-weight: $link_font_weight; + font-weight: normal; color: $link_colour; text-decoration: none; } @@ -130,19 +130,17 @@ pre code { code { font-size: 1em; padding: 5px; - border: 1px solid $code_borderc; - background: $code_bgcolour; - color: $code_txtcolour; + border: 1px solid #ccc; + background: #ccc; + color: #000; } pre { - background: $pre_bgcolour; - color: $pre_txtcolour; - border:1px solid $pre_borderc; + background: #F5F5F5; + color: #333; + border:1px solid #ccc; } - - .ccollapse-wrapper { border: 1px solid #CCC; padding: 5px; @@ -255,7 +253,7 @@ footer { } .preview { - background: url('../img/$preview_backgroundimg'); + background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); } #theme-preview { @@ -268,10 +266,12 @@ footer { } /*TODO: we should use one class for all this. */ +/* .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { - color: $selected_active_colour !important; - text-decoration: $selected_active_deco !important; + color: #444 !important; + text-decoration: none !important; } +*/ .fileas-all { text-decoration: none !important; @@ -777,7 +777,7 @@ a.rateme, div.rateme { padding: 0px 5px 0px 5px; border-radius: $radiuspx; border-color: $nav_bd; - background-color: $search_background; + background-color: #eee; transition: background-color 300ms ease 0s; } @@ -1250,7 +1250,6 @@ div.jGrowl div.jGrowl-notification { .autocomplete { color: $font_colour; - background: $dropdown_bgcolour; cursor: pointer; text-align: left; max-height: 350px; @@ -1260,7 +1259,7 @@ div.jGrowl div.jGrowl-notification { } .autocomplete .selected { - background: $search_background; + background: #eee; } .autocomplete div { @@ -1312,12 +1311,12 @@ header { } .notif-item a { - color: $notif_itemcolour; + color: #000; } .notif-item a:hover { text-decoration: underline; - color: $notif_itemhovercolour; + color: #000; } .notif-image { @@ -1650,7 +1649,7 @@ img.mail-list-sender-photo { } .generic-content-wrapper-styled { - background-color: $genericcontent_bgcolour; + background-color: $comment_item_colour; padding: 10px; border-radius: $radiuspx; } @@ -1964,10 +1963,9 @@ nav ul li .notify-unseen blockquote { font-size: $font_size; font-style: italic; - background-color: $blockquote_bgcolour; - border-left: 3px solid $blockquote_bordercolour; + border-left: 3px solid #ccc; padding: 0.4em; - color: $blockquote_colour; + color: #4d4d4d; margin: 0px 0px 0px 20px; } @@ -1996,35 +1994,12 @@ nav .badge.mail-update:hover { .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; - background-color: $dropdown_bgcolour; -} - -.dropdown-menu >li > a { - color: $dropdown_textcolour; -} - - -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: $dropdown_txtcolhover; - background-color: $dropdown_bgcolhover; - $dropdown_bgimghover -} - -aside .nav > li > a:hover, aside .nav > li > a:focus { - text-decoration: $navtabs_decohover; - background-color: $navaside_bghover; } .dropdown-menu img { border-radius: $radiuspx; } -.open .dropdown-toggle.btn-default { - color: $dropdown_togglecol; - background-color: $dropdown_togglebgcol; - border-color: $dropdown_bordercol; -} - .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); background-image: linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -2093,41 +2068,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { box-shadow: none; } -.nav-tabs{ - border-bottom:1px solid $navtabs_borderc; -} - -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{ - color: $navtabs_fontcolour; - background-color: $navtabs_bgcolour; -} - -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid $navtabs_borderc; -} - -.nav-tabs.nav-justified > li > a { - $navtabs_linkcolour -} - -.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: $navtabs_decohover; - background-color: $navtabs_bgchover; - border-color: transparent; - $navtabs_linkchover -} - -@media (min-width: 768px) { - .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid $navtabs_borderc; - } - .nav-tabs.nav-justified > .active > a, - .nav-tabs.nav-justified > .active > a:hover, - .nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: transparent; - } -} - .btn { font-size: $body_font_size; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 2133331c6..06dbee139 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -96,30 +96,10 @@ if(! $a->install) { $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; - if (! $navtabs_borderc) - $navtabs_borderc = "rgba(204,204,204,0.8)"; - if (! $navtabs_fontcolour) - $navtabs_fontcolour = "#555"; - if (! $navtabs_bgcolour) - $navtabs_bgcolour = "rgba(254,254,254,0.4)"; - if (! $navtabs_linkcolour) - $navtabs_linkcolour = ""; - if (! $navtabs_linkchover) - $navtabs_linkchover = ""; - if (! $navtabs_decohover) - $navtabs_decohover = "none"; - if (! $navtabs_bgchover) - $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) $link_colour = "#337AB7"; - if (! $navaside_bghover) - $navaside_bghover = "#eee"; - if (! $link_font_weight) - $link_font_weight = "normal"; if (! $banner_colour) $banner_colour = "#fff"; - if (! $search_background) - $search_background = "#eee"; if (! $bgcolour) $bgcolour = "#fdfdfd"; if (! $background_image) @@ -128,8 +108,6 @@ if(! $a->install) { $item_colour = "rgba(238,238,238,0.8)"; if (! $comment_item_colour) $comment_item_colour = "rgba(254,254,254,0.4)"; - if (! $genericcontent_bgcolour) - $genericcontent_bgcolour = $comment_item_colour; if (! $comment_border_colour) $comment_border_colour = "rgba(238,238,238,0.8)"; if (! $toolicon_colour) @@ -144,65 +122,10 @@ if(! $a->install) { $body_font_size = "0.75rem"; if (! $font_colour) $font_colour = "#4d4d4d"; - if (! $selected_active_colour) - $selected_active_colour = "#444"; - if (! $selected_active_deco) - $selected_active_deco = "none"; - if (! $blockquote_colour) - $blockquote_colour = "#4d4d4d"; - if (! $blockquote_bgcolour) - $blockquote_bgcolour = ""; - if (! $blockquote_bordercolour) - $blockquote_bordercolour = "#ccc"; - if (! $code_borderc) - $code_borderc = "#ccc"; - if (! $code_bgcolour) - $code_bgcolour = "#ccc"; - if (! $code_txtcolour) - $code_txtcolour = "#000"; - if (! $pre_borderc) - $pre_borderc = "#ccc"; - if (! $pre_bgcolour) - $pre_bgcolour = "#F5F5F5"; - if (! $pre_txtcolour) - $pre_txtcolour = "#333"; - if (! $notif_itemcolour) - $notif_itemcolour = "#000"; - if (! $notif_itemhovercolour) - $notif_itemhovercolour = "#000"; - if (! $dropdown_bgcolour) - $dropdown_bgcolour = "#FFF"; - if (! $dropdown_textcolour) - $dropdown_textcolour = "#333"; - if (! $dropdown_txtcolhover) - $dropdown_txtcolhover = "#262626"; - if (! $dropdown_bgcolhover) - $dropdown_bgcolhover = "#F5F5F5"; - if (! $dropdown_bgimghover) - $dropdown_bgimghover = ""; - if (! $dropdown_togglecol) - $dropdown_togglecol = "#333"; - if (! $dropdown_togglebgcol) - $dropdown_togglebgcol = "#EBEBEB"; - if (! $dropdown_bordercol) - $dropdown_bordercol = "#ADADAD"; - if (! $preview_backgroundimg) - $preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif"; - if (! $acpopup_bgcolour) - $acpopup_bgcolour = "#fff"; - if (! $acpopup_bordercolour) - $acpopup_bordercolour = "#ccc"; - if (! $acpopup_tgbl_bgcolour) - $acpopup_tgbl_bgcolour = "#ddddff"; - if (! $acpopup_hovercolour) - $acpopup_hovercolour = "#000"; - if (! $radius) $radius = "4"; if (! $shadow) $shadow = "0"; - if(! $active_colour) - $active_colour = "#fff"; if (! $converse_width) $converse_width = "1024"; if(! $top_photo) @@ -211,7 +134,6 @@ if(! $a->install) { $comment_indent = '0px'; if(! $reply_photo) $reply_photo = '32px'; - if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -241,21 +163,10 @@ $options = array ( '$nav_bd' => $nav_bd, '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, -'$navtabs_borderc' => $navtabs_borderc, -'$navtabs_fontcolour' => $navtabs_fontcolour, -'$navtabs_bgcolour' => $navtabs_bgcolour, -'$navtabs_linkcolour' => $navtabs_linkcolour, -'$navtabs_linkchover' => $navtabs_linkchover, -'$navtabs_bgchover' => $navtabs_bgchover, -'$navtabs_decohover' => $navtabs_decohover, -'$navaside_bghover' => $navaside_bghover, '$link_colour' => $link_colour, -'$link_font_weight' => $link_font_weight, '$banner_colour' => $banner_colour, -'$search_background' => $search_background, '$bgcolour' => $bgcolour, '$background_image' => $background_image, -'$genericcontent_bgcolour' => $genericcontent_bgcolour, '$item_colour' => $item_colour, '$comment_item_colour' => $comment_item_colour, '$comment_border_colour' => $comment_border_colour, @@ -263,37 +174,9 @@ $options = array ( '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, -'$selected_active_colour' => $selected_active_colour, -'$selected_active_deco' => $selected_active_deco, '$body_font_size' => $body_font_size, -'$blockquote_colour' => $blockquote_colour, -'$blockquote_bgcolour' => $blockquote_bgcolour, -'$blockquote_bordercolour' => $blockquote_bordercolour, -'$blockquote_bgcolourhover' => $blockquote_bgcolourhover, -'$code_borderc' => $code_borderc, -'$code_bgcolour' => $code_bgcolour, -'$code_txtcolour' => $code_txtcolour, -'$pre_borderc' => $pre_borderc, -'$pre_bgcolour' => $pre_bgcolour, -'$pre_txtcolour' => $pre_txtcolour, -'$notif_itemcolour' => $notif_itemcolour, -'$notif_itemhovercolour' => $notif_itemhovercolour, -'$dropdown_bgcolour' => $dropdown_bgcolour, -'$dropdown_textcolour' => $dropdown_textcolour, -'$dropdown_txtcolhover' => $dropdown_txtcolhover, -'$dropdown_bgcolhover' => $dropdown_bgcolhover, -'$dropdown_bgimghover' => $dropdown_bgimghover, -'$dropdown_togglecol' => $dropdown_togglecol, -'$dropdown_togglebgcol' => $dropdown_togglebgcol, -'$dropdown_bordercol' => $dropdown_bordercol, -'$preview_backgroundimg' => $preview_backgroundimg, -'$acpopup_bgcolour' => $acpopup_bgcolour, -'$acpopup_bordercolour' => $acpopup_bordercolour, -'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour, -'$acpopup_hovercolour' => $acpopup_hovercolour, '$radius' => $radius, '$shadow' => $shadow, -'$active_colour' => $active_colour, '$converse_width' => $converse_width, '$nav_float_min_opacity' => $nav_float_min_opacity, '$nav_percent_min_opacity' => $nav_percent_min_opacity, -- cgit v1.2.3 From d60c2b16218603a2b4ed37c3c1edcf899558462c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 6 Jun 2015 15:51:15 +0200 Subject: whitespace --- view/theme/redbasic/php/style.php | 344 +++++++++++++++++++------------------- 1 file changed, 175 insertions(+), 169 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 06dbee139..c6231e690 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,194 +1,200 @@ install) { + // Get the UID of the channel owner $uid = get_theme_uid(); - if($uid) - load_pconfig($uid,'redbasic'); - -// Load the owners pconfig - $nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); - $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); - $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); - $nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top"); - $nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom"); - $nav_bd = get_pconfig($uid, "redbasic", "nav_bd"); - $nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour"); - $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); - $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); - $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); - $link_colour = get_pconfig($uid, "redbasic", "link_colour"); - $schema = get_pconfig($uid,'redbasic','schema'); - $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); - $background_image = get_pconfig($uid, "redbasic", "background_image"); - $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); - $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); - $item_colour = get_pconfig($uid, "redbasic", "item_colour"); - $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); - $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); - $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); - $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); - $font_size = get_pconfig($uid, "redbasic", "font_size"); - $font_colour = get_pconfig($uid, "redbasic", "font_colour"); - $radius = get_pconfig($uid, "redbasic", "radius"); - $shadow = get_pconfig($uid,"redbasic","photo_shadow"); - $converse_width=get_pconfig($uid,"redbasic","converse_width"); - $converse_center=get_pconfig($uid,"redbasic","converse_center"); - $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); - $top_photo=get_pconfig($uid,'redbasic','top_photo'); - $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); + if($uid) { + load_pconfig($uid,'redbasic'); + } + + // Load the owners pconfig + $nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); + $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); + $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); + $nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top"); + $nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom"); + $nav_bd = get_pconfig($uid, "redbasic", "nav_bd"); + $nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour"); + $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); + $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); + $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); + $schema = get_pconfig($uid,'redbasic','schema'); + $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); + $background_image = get_pconfig($uid, "redbasic", "background_image"); + $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); + $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); + $item_colour = get_pconfig($uid, "redbasic", "item_colour"); + $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); + $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); + $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); + $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); + $font_size = get_pconfig($uid, "redbasic", "font_size"); + $font_colour = get_pconfig($uid, "redbasic", "font_colour"); + $radius = get_pconfig($uid, "redbasic", "radius"); + $shadow = get_pconfig($uid,"redbasic","photo_shadow"); + $converse_width=get_pconfig($uid,"redbasic","converse_width"); + $converse_center=get_pconfig($uid,"redbasic","converse_center"); + $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); + $top_photo=get_pconfig($uid,'redbasic','top_photo'); + $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); } - // Now load the scheme. If a value is changed above, we'll keep the settings - // If not, we'll keep those defined by the schema - // Setting $schema to '' wasn't working for some reason, so we'll check it's - // not --- like the mobile theme does instead. +// Now load the scheme. If a value is changed above, we'll keep the settings +// If not, we'll keep those defined by the schema +// Setting $schema to '' wasn't working for some reason, so we'll check it's +// not --- like the mobile theme does instead. +// Allow layouts to over-ride the schema - // Allow layouts to over-ride the schema +if($_REQUEST['schema']) { + $schema = $_REQUEST['schema']; +} - if($_REQUEST['schema']) - $schema = $_REQUEST['schema']; +if (($schema) && ($schema != '---')) { - if (($schema) && ($schema != '---')) { - // Check it exists, because this setting gets distributed to clones - if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) { - $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; - require_once ($schemefile); - } - if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) { - $schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css'); - } + // Check it exists, because this setting gets distributed to clones + if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) { + $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; + require_once ($schemefile); + } + if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) { + $schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css'); } - // If we haven't got a schema, load the default. We shouldn't touch this - we - // should leave it for admins to define for themselves. - if (! $schema) { - if(file_exists('view/theme/redbasic/schema/default.php')) { - $schemefile = 'view/theme/redbasic/schema/default.php'; - require_once ($schemefile); - } - if(file_exists('view/theme/redbasic/schema/default.css')) { - $schemecss = file_get_contents('view/theme/redbasic/schema/default.css'); - } +} + +// If we haven't got a schema, load the default. We shouldn't touch this - we +// should leave it for admins to define for themselves. +if (! $schema) { + + if(file_exists('view/theme/redbasic/schema/default.php')) { + $schemefile = 'view/theme/redbasic/schema/default.php'; + require_once ($schemefile); } - + + if(file_exists('view/theme/redbasic/schema/default.css')) { + $schemecss = file_get_contents('view/theme/redbasic/schema/default.css'); + } + +} //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. - - if (! $nav_bg) - $nav_bg = "#222"; - if (! $nav_gradient_top) - $nav_gradient_top = "#3c3c3c"; - if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#222"; - if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#222"; - if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#282828"; - if (! $nav_bd) - $nav_bd = "#222"; - if (! $nav_icon_colour) - $nav_icon_colour = "#999"; - if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; - if (! $link_colour) - $link_colour = "#337AB7"; - if (! $banner_colour) - $banner_colour = "#fff"; - if (! $bgcolour) - $bgcolour = "#fdfdfd"; - if (! $background_image) - $background_image =''; - if (! $item_colour) - $item_colour = "rgba(238,238,238,0.8)"; - if (! $comment_item_colour) - $comment_item_colour = "rgba(254,254,254,0.4)"; - if (! $comment_border_colour) - $comment_border_colour = "rgba(238,238,238,0.8)"; - if (! $toolicon_colour) - $toolicon_colour = '#777'; - if (! $toolicon_activecolour) - $toolicon_activecolour = '#000'; - if (! $item_opacity) - $item_opacity = "1"; - if (! $font_size) - $font_size = "0.9rem"; - if (! $body_font_size) - $body_font_size = "0.75rem"; - if (! $font_colour) - $font_colour = "#4d4d4d"; - if (! $radius) - $radius = "4"; - if (! $shadow) - $shadow = "0"; - if (! $converse_width) - $converse_width = "1024"; - if(! $top_photo) - $top_photo = '48px'; - if(! $comment_indent) - $comment_indent = '0px'; - if(! $reply_photo) - $reply_photo = '32px'; - if($nav_min_opacity === false || $nav_min_opacity === '') { - $nav_float_min_opacity = 1.0; - $nav_percent_min_opacity = 100; - } - else { - $nav_float_min_opacity = (float) $nav_min_opacity; - $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; - } +if (! $nav_bg) + $nav_bg = "#222"; +if (! $nav_gradient_top) + $nav_gradient_top = "#3c3c3c"; +if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#222"; +if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#222"; +if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#282828"; +if (! $nav_bd) + $nav_bd = "#222"; +if (! $nav_icon_colour) + $nav_icon_colour = "#999"; +if (! $nav_active_icon_colour) + $nav_active_icon_colour = "#fff"; +if (! $link_colour) + $link_colour = "#337AB7"; +if (! $banner_colour) + $banner_colour = "#fff"; +if (! $bgcolour) + $bgcolour = "#fdfdfd"; +if (! $background_image) + $background_image =''; +if (! $item_colour) + $item_colour = "rgba(238,238,238,0.8)"; +if (! $comment_item_colour) + $comment_item_colour = "rgba(254,254,254,0.4)"; +if (! $comment_border_colour) + $comment_border_colour = "rgba(238,238,238,0.8)"; +if (! $toolicon_colour) + $toolicon_colour = '#777'; +if (! $toolicon_activecolour) + $toolicon_activecolour = '#000'; +if (! $item_opacity) + $item_opacity = "1"; +if (! $font_size) + $font_size = "0.9rem"; +if (! $body_font_size) + $body_font_size = "0.75rem"; +if (! $font_colour) + $font_colour = "#4d4d4d"; +if (! $radius) + $radius = "4"; +if (! $shadow) + $shadow = "0"; +if (! $converse_width) + $converse_width = "1024"; +if(! $top_photo) + $top_photo = '48px'; +if(! $comment_indent) + $comment_indent = '0px'; +if(! $reply_photo) + $reply_photo = '32px'; +if($nav_min_opacity === false || $nav_min_opacity === '') { + $nav_float_min_opacity = 1.0; + $nav_percent_min_opacity = 100; +} +else { + $nav_float_min_opacity = (float) $nav_min_opacity; + $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; +} // Apply the settings - if(file_exists('view/theme/redbasic/css/style.css')) { - $x = file_get_contents('view/theme/redbasic/css/style.css'); - - -// left aside is 231px + converse width -$main_width = (231 + intval($converse_width)); - -// prevent main_width smaller than 768px -$main_width = (($main_width < 768) ? 768 : $main_width) . 'px'; - -$options = array ( -'$nav_bg' => $nav_bg, -'$nav_gradient_top' => $nav_gradient_top, -'$nav_gradient_bottom' => $nav_gradient_bottom, -'$nav_active_gradient_top' => $nav_active_gradient_top, -'$nav_active_gradient_bottom' => $nav_active_gradient_bottom, -'$nav_bd' => $nav_bd, -'$nav_icon_colour' => $nav_icon_colour, -'$nav_active_icon_colour' => $nav_active_icon_colour, -'$link_colour' => $link_colour, -'$banner_colour' => $banner_colour, -'$bgcolour' => $bgcolour, -'$background_image' => $background_image, -'$item_colour' => $item_colour, -'$comment_item_colour' => $comment_item_colour, -'$comment_border_colour' => $comment_border_colour, -'$toolicon_colour' => $toolicon_colour, -'$toolicon_activecolour' => $toolicon_activecolour, -'$font_size' => $font_size, -'$font_colour' => $font_colour, -'$body_font_size' => $body_font_size, -'$radius' => $radius, -'$shadow' => $shadow, -'$converse_width' => $converse_width, -'$nav_float_min_opacity' => $nav_float_min_opacity, -'$nav_percent_min_opacity' => $nav_percent_min_opacity, -'$top_photo' => $top_photo, -'$reply_photo' => $reply_photo, -'$pmenu_top' => $pmenu_top, -'$pmenu_reply' => $pmenu_reply, -'$comment_indent' => $comment_indent, -'$main_width' => $main_width, -); - -echo str_replace(array_keys($options), array_values($options), $x); +if(file_exists('view/theme/redbasic/css/style.css')) { + + $x = file_get_contents('view/theme/redbasic/css/style.css'); + + // left aside is 231px + converse width + $main_width = (231 + intval($converse_width)); + + // prevent main_width smaller than 768px + $main_width = (($main_width < 768) ? 768 : $main_width) . 'px'; + + $options = array ( + '$nav_bg' => $nav_bg, + '$nav_gradient_top' => $nav_gradient_top, + '$nav_gradient_bottom' => $nav_gradient_bottom, + '$nav_active_gradient_top' => $nav_active_gradient_top, + '$nav_active_gradient_bottom' => $nav_active_gradient_bottom, + '$nav_bd' => $nav_bd, + '$nav_icon_colour' => $nav_icon_colour, + '$nav_active_icon_colour' => $nav_active_icon_colour, + '$link_colour' => $link_colour, + '$banner_colour' => $banner_colour, + '$bgcolour' => $bgcolour, + '$background_image' => $background_image, + '$item_colour' => $item_colour, + '$comment_item_colour' => $comment_item_colour, + '$comment_border_colour' => $comment_border_colour, + '$toolicon_colour' => $toolicon_colour, + '$toolicon_activecolour' => $toolicon_activecolour, + '$font_size' => $font_size, + '$font_colour' => $font_colour, + '$body_font_size' => $body_font_size, + '$radius' => $radius, + '$shadow' => $shadow, + '$converse_width' => $converse_width, + '$nav_float_min_opacity' => $nav_float_min_opacity, + '$nav_percent_min_opacity' => $nav_percent_min_opacity, + '$top_photo' => $top_photo, + '$reply_photo' => $reply_photo, + '$pmenu_top' => $pmenu_top, + '$pmenu_reply' => $pmenu_reply, + '$comment_indent' => $comment_indent, + '$main_width' => $main_width, + ); + + echo str_replace(array_keys($options), array_values($options), $x); + } if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { -- cgit v1.2.3 From 2c52be8780f870ef054ad789c82db1b9388d7bf3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 6 Jun 2015 17:05:38 +0200 Subject: css fixes --- view/theme/redbasic/css/style.css | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8f70d469a..03f900566 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -69,28 +69,20 @@ abbr { margin-right: 5px; } -a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { - font-weight: normal; - color: $link_colour; - text-decoration: none; -} - -a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } - +a, .fakelink { - cursor: pointer; + color: $link_colour; } -a.btn-default { - color: #333; +a:hover, +a:focus +.fakelink:hover, +.fakelink:focus { + color: $link_colour; } -a.btn-success, -a.btn-danger, -a.btn-info, -a.btn-warning, -a.btn-primary { - color: #fff; +.fakelink { + cursor: pointer; } input[type="text"], -- cgit v1.2.3 From f5e439236c91134efab7bc04c2c98c23a81dc03d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 6 Jun 2015 20:23:00 +0200 Subject: missing comma --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 03f900566..f391c84e3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -75,7 +75,7 @@ a, } a:hover, -a:focus +a:focus, .fakelink:hover, .fakelink:focus { color: $link_colour; -- cgit v1.2.3