diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 172 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 |
7 files changed, 137 insertions, 48 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7a6c13798..842e7063a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -301,14 +301,12 @@ footer { #main-login #id_remember { float: left; padding: 0; - margin-top: 15px; margin-bottom: 0; margin-left: 0; width: 20px; } -#main-login .field.checkbox label { - margin-top: 15px; +#main-login .field.checkbox > label { margin-bottom: 0; float: left; width: 100px; @@ -373,13 +371,14 @@ footer { font-weight: bold; } -#profile-edit-wrapper .field label { +#profile-edit-wrapper .field { margin-top: 20px; +} +#profile-edit-wrapper .field > label { width: 175px; } #profile-edit-wrapper .field input[type="text"] { - margin-top: 20px; width: 220px; } @@ -689,18 +688,6 @@ footer { overflow: hidden; } -#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { - color: #8888FF; - text-decoration: none; - cursor: pointer; -} - -#photos-upload-perms-menu:hover { - color: #0000FF; - text-decoration: underline; - cursor: pointer; -} - #photo-view-wrapper { background-color: $item_colour; } @@ -1041,7 +1028,7 @@ footer { background: none repeat scroll 0% 0% $cal_bgcolour !important; } -#fancybox-content { +#colorbox { border: 0px solid $fancybox_bgcolour; background-color: $fancybox_bgcolour; } @@ -1254,7 +1241,7 @@ footer { width: 100% } -.field label { +.field > label { float: left; width: 350px; } @@ -1308,6 +1295,8 @@ footer { .hidden { display: none!important; } .field.radio .field_help { margin-left: 0px; } +.field.checkbox .field_help { display: inline; margin-left: 10px; } + /** * OAuth @@ -1774,7 +1763,6 @@ img.mail-list-sender-photo { color: #777; } -#jot-perms-icon, .jot-icons { color: $toolicon_colour; } @@ -1990,7 +1978,7 @@ img.mail-list-sender-photo { .chat-item-text { border-radius: $radiuspx; - background-color: #eee; + background-color: $chat_txtbgcol; } /* nav bootstrap */ @@ -2031,6 +2019,43 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ color: $nav_active_icon_colour; } +.section-title-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; + margin-bottom: 3px; +} + +.section-title-wrapper h2 { + margin-top: 0px; + margin-bottom: 0px; +} + +.section-content-tools-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + margin-bottom: 3px; +} + +.section-content-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; +} + +.section-content-wrapper-np { + background-color: $comment_item_colour; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; +} + +[id^="cloud-index-"]:hover, +.cloud-index-active { + background-color: $item_colour; +} + /* bootstrap overrides */ blockquote { @@ -2051,6 +2076,20 @@ nav .badge:hover { background-color: #999; } +nav .badge.home-update, +nav .badge.notify-update, +nav .badge.intro-update, +nav .badge.mail-update { + background-color:#C9302C; +} + +nav .badge.home-update:hover, +nav .badge.notify-update:hover, +nav .badge.intro-update:hover, +nav .badge.mail-update:hover { + background-color:#D9534F; +} + .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; @@ -2226,32 +2265,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); } -.section-title-wrapper { - padding: 7px 10px; - background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; - margin-bottom: 3px; -} - -.section-title-wrapper h2 { - margin-top: 0px; - margin-bottom: 0px; -} - -.section-content-tools-wrapper { - padding: 7px 10px; - background-color: $comment_item_colour; - margin-bottom: 3px; -} - -.section-content-wrapper { - padding: 7px 10px; - background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; -} - @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); @@ -2338,3 +2351,68 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { .jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus { border: 1px solid #cccccc; } + +/* Abusing theme-green is less work than makeing a new new one */ +.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important } + + +/* Turn checkboxes into switches */ +.field.checkbox .fieldhelp { vertical-align:top; } +.field.checkbox > div { + position: relative; width: 70px; + -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; + display:inline-block; +} + +.field.checkbox input { + display: none; +} + +.field.checkbox > div label { + display: block; overflow: hidden; cursor: pointer; + border: 2px solid #999999; + border-radius: 20px; + margin:0px; +} + +.onoffswitch-inner { + display: block; width: 200%; margin-left: -100%; + -moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s; + -o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s; +} + +.onoffswitch-inner:before, .onoffswitch-inner:after { + display: block; float: left; width: 50%; height: 20px; padding: 0; line-height:20px; + -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; +} + +.onoffswitch-inner:before { + content: attr(data-on); + padding-left: 10px; + background-color: #EEEEEE; +} + +.onoffswitch-inner:after { + content: attr(data-off); + padding-right: 10px; + background-color: #EEEEEE; color: #999999; + text-align: right; +} + +.onoffswitch-switch { + display: block; width: 25px; margin-left: 6px; margin-right: 6px; margin-top:5%; margin-bottom:5%; + background: #A1A1A1; + border: 2px solid #999999; border-radius: 20px; + position: absolute; top: 0; bottom: 0; right: 36px; + -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s; + -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; +} + +.field.checkbox > div > input:checked + label .onoffswitch-inner { + margin-left: 0; +} + +.field.checkbox > div > input:checked + label .onoffswitch-switch { + right: -2px; + background-color: #27A1CA; +} diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 50ec9613b..5d44a9b9d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -272,6 +272,8 @@ if(! $a->install) { $advperm_gradientcol = "#E8E8E8"; if(! $cal_bgcolour) $cal_bgcolour = "#FCF8E3"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#EEE"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#FFF"; if (!$comment_padding) @@ -409,6 +411,7 @@ $options = array ( '$advperm_bordercol' => $advperm_bordercol, '$advperm_gradientcol' => $advperm_gradientcol, '$cal_bgcolour' => $cal_bgcolour, +'$chat_txtbgcol' => $chat_txtbgcol, '$fancybox_bgcolour' => $fancybox_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 51a6d23a4..0203d30cd 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -176,6 +176,8 @@ $advperm_gradientcol = "#1E1E1E"; if(! $cal_bgcolour) $cal_bgcolour = "#333"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#222"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#1E1E1E"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 2bf002bca..ddbcae495 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -176,6 +176,8 @@ $advperm_gradientcol = "#fff"; if(! $cal_bgcolour) $cal_bgcolour = "#fff"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#fff"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#fff"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 15adcf198..f034185f7 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -176,6 +176,8 @@ if (! $navaside_bghover) $advperm_gradientcol = "#000"; if(! $cal_bgcolour) $cal_bgcolour = "#000"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#000"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#000"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 96450d835..95ede29ed 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -176,6 +176,8 @@ $advperm_gradientcol = "#000"; if(! $cal_bgcolour) $cal_bgcolour = "#000"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#000"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#000"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 70b42b6cd..adf2e632d 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -34,7 +34,7 @@ {{include file="field_input.tpl" field=$nav_min_opacity}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{include file="field_checkbox.tpl" field=$sloppy_photos}} +{{*include file="field_checkbox.tpl" field=$sloppy_photos*}} <script> $(function(){ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker(); |