diff options
author | zottel <github@zottel.net> | 2016-08-05 09:17:00 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2016-08-05 09:17:00 +0200 |
commit | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (patch) | |
tree | 2ec87e623880253714c80e5ac927a67c9dda0df9 /view/theme | |
parent | dd83f6f3567ffa58b6addf2bc070ee244c868138 (diff) | |
parent | 92862f93f31beb009247144bae5d8b0a58b562b5 (diff) | |
download | volse-hubzilla-6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e.tar.gz volse-hubzilla-6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e.tar.bz2 volse-hubzilla-6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view/theme')
-rw-r--r-- | view/theme/redbasic/schema/dark.css | 43 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.css | 7 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.css | 52 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.css | 44 |
4 files changed, 142 insertions, 4 deletions
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index ea50f50ec..ed2714dfc 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -3,6 +3,31 @@ background-color: transparent; } +textarea, input, select +{ + color: #BBB !important; + background: #333 !important; + border-color: #2B2B2B !important; + } + +#profile-jot-submit-wrapper { + border-top: none; + padding: 10px 0; +} + +#jot-title-wrap { + border-bottom: none; + margin-bottom: 5px; +} + +optgroup { + color: #CCC !important; +} + +option { + color: $link_colour !important; +} + .vcard, #contact-block, .widget { background-color: transparent; border: none; @@ -390,3 +415,21 @@ pre { box-shadow: 0px 3px 3px #222; } +.contextual-help-content-open { + background: $nav_bg; + top: 50px; + border-bottom: #555 1px solid; + box-shadow: 0px 3px 3px rgba(85,85,85,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index b7cca0930..7dd8125a4 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -290,3 +290,10 @@ pre { -webkit-box-shadow: none; box-shadow: none; } + + +.contextual-help-content-open { + background: #FFF; + top: 50px; + +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 990980e8f..ca2e5b15a 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -3,6 +3,31 @@ background-color: transparent; } +textarea, input, select +{ + color: $font_colour !important; + background: $bgcolour !important; + border: 1px solid #143D12 !important; + } + +#profile-jot-submit-wrapper { + border-top: none; + padding: 10px 0; +} + +#jot-title-wrap { + border-bottom: none; + margin-bottom: 5px; +} + +optgroup { + color: #32962D !important; +} + +option { + color: $link_colour !important; +} + .vcard, #contact-block, .widget { background-color: transparent; border: none; @@ -153,22 +178,22 @@ input[type="submit"] { color: #50f148 !important; } -nav .dropdown-menu>li>a{ +nav .dropdown-menu>li>a { color: #50f148; } -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { color: #50f148; background-color: #143D12; background-image: none; } -nav .dropdown-menu .divider{ +nav .dropdown-menu .divider { background-color: #143D12; } -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { color: #50f148; background-color: #143D12; background-image: none; @@ -339,3 +364,22 @@ pre { -webkit-box-shadow: none; box-shadow: none; } + +.contextual-help-content-open { + background: $nav_bg; + top: 50px; + border-bottom: #1C5419 1px solid; + box-shadow: 0px 3px 3px rgba(28,84,25,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index c23dbaf68..a462c4d29 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -3,6 +3,31 @@ background-color: transparent; } +textarea, input, select +{ + color: $font_colour !important; + background: $bgcolour !important; + border: 1px solid #FFF !important; + } + +#profile-jot-submit-wrapper { + border-top: none; + padding: 10px 0; +} + +#jot-title-wrap { + border-bottom: none; + margin-bottom: 5px; +} + +optgroup { + color: #FFF !important; +} + +option { + color: $link_colour !important; +} + .vcard, #contact-block, .widget { background-color: transparent; border: none; @@ -312,3 +337,22 @@ pre { -webkit-box-shadow: none; box-shadow: none; } + +.contextual-help-content-open { + background: $nav_bg; + top: 50px; + border-bottom: #FFF 1px solid; + box-shadow: 0px 3px 3px rgba(255,255,255,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} |