aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
commitb5fad9feefd0f261807222d8a4c42ead6253a65c (patch)
tree399cd4a1b79f61530924ea59670af0bdd6cee5be /view/theme
parent89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff)
parentb29a968be8df52cd7c9b6d5bebb618534788337c (diff)
downloadvolse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip
Fix merge conflict
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css44
-rw-r--r--view/theme/redbasic/php/style.php2
2 files changed, 30 insertions, 16 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 68769e976..06f24eedd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -13,7 +13,7 @@ html {
}
body {
- font-family: arial,freesans,sans-serif;
+ font-family: sans-serif, arial, freesans;
font-size: $body_font_size;
background-color: $bgcolour;
background-image: url('$background_image');
@@ -37,7 +37,7 @@ h5, .h5, h6, .h6 {
}
.jslider {
- font-family: arial,freesans,sans-serif;
+ font-family: sans-serif, arial, freesans;
}
abbr {
@@ -45,6 +45,10 @@ abbr {
}
/* icons */
+.tool-icons {
+ color: $toolicon_colour;
+}
+
.icon {
background-color: transparent ;
background-repeat: no-repeat;
@@ -84,17 +88,19 @@ a.btn-success {
input[type="text"],
input[type="password"],
input[type="submit"],
+input[type="file"],
select,
textarea {
- font-family: arial,freesans,sans-serif;
+ font-family: sans-serif, arial, freesans;
font-size: $body_font_size;
}
input {
+ padding: 5px;
+ line-height: 1.5;
border: 1px solid $input_border;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
- padding: 3px;
}
input[type="submit"] {
@@ -105,10 +111,6 @@ input[type="submit"] {
padding: 6px 12px;
}
-input[type="submit"]:hover {
- text-decoration: underline;
-}
-
button, input, optgroup, select, textarea {
color: #000;
}
@@ -704,8 +706,7 @@ footer {
cursor: pointer;
}
-#photo-view-wrapper,
-#photo-edit-edit {
+#photo-view-wrapper {
background-color: $item_colour;
}
@@ -868,6 +869,7 @@ footer {
}
#nav-search-text {
+ font-size: 12px;
height: 20px;
margin: 15px;
padding: 0px 5px 0px 5px;
@@ -2201,6 +2203,7 @@ aside .nav-pills > li > a {
.navbar-inverse .navbar-nav > li > a {
+ font-size: 12px;
color: $nav_icon_colour;
text-shadow: 0px 0px 0px;
}
@@ -2336,15 +2339,19 @@ aside .nav-pills > li > a {
margin-bottom: 0px;
}
-.section-title-submenu {
- margin-top: 10px;
+.section-content-tools-wrapper {
+ padding: 7px 10px;
+ background-color: $comment_item_colour;
+ margin-bottom: 3px;
}
-.section-title-submenu a {
- margin-right: 10px;
+.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);
@@ -2387,6 +2394,13 @@ aside .nav-pills > li > a {
}
+/* release the navbar in landscape view on small devices */
+@media screen and (max-height: 320px) {
+ .navbar-fixed-top {
+ position: absolute;
+ }
+}
+
.shareable_element_text {
height: 300px;
width: 300px;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 045ddc309..55b35af4b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -226,7 +226,7 @@ if(! $a->install) {
if (! $input_linksubmit)
$input_linksubmit = "#0080FF";
if (! $input_border)
- $input_border = "#666";
+ $input_border = "#ccc";
if (! $input_colourhover)
$input_colourhover = "#333";
if (! $input_decohover)