aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-02-19 18:42:37 +0100
committermarijus <mario@mariovavti.com>2014-02-19 18:42:37 +0100
commitc09087262c29c093762e91b280fa452c7b935ce9 (patch)
treed6895cf9f7a8001de4d83e5b01188e55faabb82b /view/theme
parent6ac81c936077caa7167ddc3a2eb3c1022826d5d9 (diff)
downloadvolse-hubzilla-c09087262c29c093762e91b280fa452c7b935ce9.tar.gz
volse-hubzilla-c09087262c29c093762e91b280fa452c7b935ce9.tar.bz2
volse-hubzilla-c09087262c29c093762e91b280fa452c7b935ce9.zip
bootstrapify the nav
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css88
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl4
2 files changed, 50 insertions, 42 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 78fdac0cd..127f09683 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -140,6 +140,8 @@ blockquote {
filter:alpha(opacity=100);
}
+/* this is not yet supported
+
nav {
background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
@@ -151,8 +153,6 @@ nav {
}
-
-
nav:hover {
background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
@@ -163,7 +163,7 @@ nav:hover {
filter:alpha(opacity=100);
}
-
+*/
nav #site-location {
color: #888a85;
@@ -204,15 +204,15 @@ header #site-location {
}
header #banner {
-
overflow: hidden;
text-align: center;
- font-size: 1.4em;
+ font-size: 14px;
font-family: tahoma, "Lucida Sans", sans;
color: $banner_colour;
font-weight: bold;
- margin-top: 1px;
+ margin: 14px;
}
+
header #banner a,
header #banner a:active,
header #banner a:visited,
@@ -879,8 +879,8 @@ footer {
}
#nav-search-spinner {
- float: right;
- margin: 12px 12px 0px 0px;
+ float: left;
+ margin: 25px 0px 0px 25px;
color: #fff;
}
@@ -892,6 +892,7 @@ footer {
#nav-search-text {
height: 20px;
+ margin: 15px;
padding: 0px 5px 0px 5px;
border-radius: 10px;
border: none;
@@ -919,11 +920,6 @@ footer {
font-family: FontAwesome;
}
-#nav-user-linkmenu img {
- border-radius: $radiuspx;
- margin-top: -4px;
-}
-
.nav-dropdown-indicator {
opacity: 0.8;
filter:alpha(opacity=80);
@@ -1548,8 +1544,8 @@ div.jGrowl div.info {
#nav-search-text-ac .autocomplete {
position: fixed;
- top: 24px;
- border: 1px solid $nav_bg_1;
+ top: 51px;
+ border: 1px solid #222;
border-top: none;
}
@@ -1628,26 +1624,6 @@ nav .fakelink:hover { text-decoration: none; }
color: #000000;
}
-nav ul {
- margin: 0px;
- padding: 0px 20px;
-}
-nav ul li {
- list-style: none;
- margin: 0px;
- padding: 0px;
- float: left;
-}
-nav ul li .menu-popup {
- left: 0px;
- right: auto;
- top: 33px;
-}
-
-#nav-user-linkmenu {
- margin-left: 5px;
-}
-
nav .nav-menu-icon {
position: relative;
height: 22px;
@@ -1785,13 +1761,10 @@ header {
position: fixed;
left: 43%;
right: 43%;
- top: 0px;
margin: 0px;
padding: 0px;
- /*width: 100%; height: 12px; */
-
- z-index: 110;
- color: #ffffff;
+ z-index: 1400;
+ color: #fff;
}
@@ -2469,3 +2442,38 @@ img.mail-list-sender-photo {
border-radius: $radiuspx;
background-color: #eee;
}
+
+/* nav bootstrap */
+nav i {
+ font-size: 14px;
+}
+
+nav img {
+ height: 47px;
+ width: 47px;
+ margin: 2px 0px 1px 10px;
+ border-radius: $radiuspx;
+}
+
+nav ul li {
+ max-height: 50px
+}
+
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link {
+ color: #333;
+}
+
+nav .badge {
+ border-radius: $radiuspx;
+}
+
+nav .dropdown-menu {
+ font-size: $body_font_size;
+ border-top-right-radius: 0px;
+ border-top-left-radius: 0px;
+ border-bottom-right-radius: $radiuspx;
+ border-bottom-left-radius: $radiuspx;
+}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index ca05986a2..cc573d99e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -4,7 +4,7 @@
</div>
{{if $expert}}
-{{include file="field_select.tpl" field=$nav_colour}}
+{{* include file="field_select.tpl" field=$nav_colour *}}
{{include file="field_input.tpl" field=$banner_colour}}
{{include file="field_input.tpl" field=$link_colour}}
{{include file="field_input.tpl" field=$bgcolour}}
@@ -19,7 +19,7 @@
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$converse_width}}
-{{include file="field_input.tpl" field=$nav_min_opacity}}
+{{* 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}}