aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-06-18 11:58:00 +0200
committerLuc Donnet2014-06-18 11:58:00 +0200
commit3acf27e0c4629a22f48faab9ba24de8e6b7d9ea3 (patch)
tree54993026998cd381f32b5a1cdc630ae143d756d6
parentc40015d0660fbed09d7aa8e47a926d7ec7ac0d66 (diff)
downloadchouette-core-3acf27e0c4629a22f48faab9ba24de8e6b7d9ea3.tar.bz2
Refactor variable for theme Refs #0026847
-rw-r--r--app/assets/stylesheets/application.css.scss1
-rw-r--r--app/assets/stylesheets/main/layout.css.scss32
-rw-r--r--app/assets/stylesheets/vendor/map_layers.css.scss9
3 files changed, 15 insertions, 27 deletions
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 7efb05b0d..872d621b3 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -1,5 +1,6 @@
// First import journal variables
// @import "bootswatch/cerulean/variables";
+$brand-primary: #61970b;
// Then bootstrap itself
@import "bootstrap";
diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index d1c42668e..ae761934d 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -15,23 +15,8 @@ h1, .h1, h2, .h2, h3, .h3 {
margin-bottom: 20px;
}
-a, a:visited {
- color: $text_color;
- }
-
-p.after_map {
- clear: both;
-}
-
-#map {
- float: right;
- width: 400px;
- height: 400px;
-}
-
-
#header {
- background: $header_background url(image-path('header.png')) no-repeat;
+ background: $brand_primary url(image-path('header.png')) no-repeat;
div.logo {
padding: 15px 0 0 30px;
@@ -54,14 +39,7 @@ p.after_map {
div.interaction{
text-align: right;
- margin: 0 20px 0 0;
-
- a.back_to_upper_menu {
- color: $tabs_color;
- text-decoration: underline;
- font-size: 0.8em;
- display: block;
- }
+ margin: 0 20px 0 0;
ul.user {
color: $tabs_color;
@@ -113,9 +91,9 @@ p.after_map {
li {
a:link, a:visited {
- background-color: $tabs_background;
- color: $tabs_color;
- }
+ background-color: $tabs_background;
+ color: $tabs_color;
+ }
a.current {
color: $text_color;
diff --git a/app/assets/stylesheets/vendor/map_layers.css.scss b/app/assets/stylesheets/vendor/map_layers.css.scss
new file mode 100644
index 000000000..7d9972038
--- /dev/null
+++ b/app/assets/stylesheets/vendor/map_layers.css.scss
@@ -0,0 +1,9 @@
+p.after_map {
+ clear: both;
+}
+
+#map {
+ float: right;
+ width: 400px;
+ height: 400px;
+} \ No newline at end of file