Merge pull request #129 from OnroerendErfgoed/DEV_0.7

Dev 0.7
OnroerendErfgoed · Jul 18, 2018 · 72fd5c0 · 72fd5c0
2 parents 37ed24e + a2e8fd6
commit 72fd5c0
Show file tree

Hide file tree

Showing 8 changed files with 5,526 additions and 19,195 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,8 @@
+0.7.0 (18-07-2018)
+==================
+- Updaten van GA macro (#125)
+- Aanpassen kleur active in menubar (#124)
+
 0.6.0 (04-07-2018)
 ==================
 

diff --git a/...yoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss b/...yoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss
@@ -67,7 +67,7 @@ $warning-color: #f08a24 !default;
 $info-color: #a0d3e8 !default;   
 $custom-color:#FFFFCC !default; 
 
-
+$very-dark-purple: rgb(33,7,41); //#210729
 $dark-purple    : rgb(117,63,127); 	// #753F7F  
 $mid-purple     : rgb(148,78,161); 	// #944EA1
 $light-purple   : rgb(176,93,191); 	// #B05DBF
@@ -230,7 +230,7 @@ $switch-font-size-lrg: 17px;
 
 $tabs-navigation-padding: rem-calc(12);
 $tabs-navigation-bg-color: $mid-purple;
-$tabs-navigation-active-bg-color: $dark-purple;
+$tabs-navigation-active-bg-color: $very-dark-purple;
 $tabs-navigation-font-color: $white;
 $tabs-navigation-font-size: rem-calc(14);
 .tabs-content {background:$light-gray;padding:5px 10px;margin-top:1px;}
@@ -248,7 +248,7 @@ $topbar-dropdown-link-bg: $mid-purple;
 // Set the link colors and styles for top-level nav
 
 $topbar-link-font-size: rem-calc(14);
-$topbar-link-bg-hover: $dark-purple;
-$topbar-link-bg-active: $dark-purple !default;
-$topbar-link-bg-active-hover: scale-color($dark-gray, $lightness: -14%);
+$topbar-link-bg-hover: $very-dark-purple;
+$topbar-link-bg-active: $very-dark-purple !default;
+$topbar-link-bg-active-hover: scale-color($very-dark-purple, $lightness: -14%);
 
diff --git a/...ces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss b/...ces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss
@@ -67,7 +67,7 @@ $warning-color: #f08a24 !default;
 $info-color: #a0d3e8 !default;   
 $custom-color:#FFFFCC !default; 
 
-
+$very-dark-purple: rgb(33,7,41); //#210729
 $dark-purple    : rgb(117,63,127); 	// #753F7F  
 $mid-purple     : rgb(148,78,161); 	// #944EA1
 $light-purple   : rgb(176,93,191); 	// #B05DBF
@@ -230,7 +230,7 @@ $switch-font-size-lrg: 17px;
 
 $tabs-navigation-padding: rem-calc(12);
 $tabs-navigation-bg-color: $mid-purple;
-$tabs-navigation-active-bg-color: $dark-purple;
+$tabs-navigation-active-bg-color: $very-dark-purple;
 $tabs-navigation-font-color: $white;
 $tabs-navigation-font-size: rem-calc(14);
 .tabs-content {background:$light-gray;padding:5px 10px;margin-top:1px;}
@@ -248,7 +248,7 @@ $topbar-dropdown-link-bg: $mid-purple;
 // Set the link colors and styles for top-level nav
 
 $topbar-link-font-size: rem-calc(14);
-$topbar-link-bg-hover: $dark-purple;
-$topbar-link-bg-active: $dark-purple !default;
-$topbar-link-bg-active-hover: scale-color($dark-gray, $lightness: -14%);
+$topbar-link-bg-hover: $very-dark-purple;
+$topbar-link-bg-active: $very-dark-purple !default;
+$topbar-link-bg-active-hover: scale-color($very-dark-purple, $lightness: -14%);
 
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-settings.scss b/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-settings.scss
@@ -67,7 +67,7 @@ $warning-color: #f08a24 !default;
 $info-color: #a0d3e8 !default;   
 $custom-color:#FFFFCC !default; 
 
-
+$very-dark-purple: rgb(33,7,41); //#210729
 $dark-purple    : rgb(117,63,127); 	// #753F7F  
 $mid-purple     : rgb(148,78,161); 	// #944EA1
 $light-purple   : rgb(176,93,191); 	// #B05DBF
@@ -230,7 +230,7 @@ $switch-font-size-lrg: 17px;
 
 $tabs-navigation-padding: rem-calc(12);
 $tabs-navigation-bg-color: $mid-purple;
-$tabs-navigation-active-bg-color: $dark-purple;
+$tabs-navigation-active-bg-color: $very-dark-purple;
 $tabs-navigation-font-color: $white;
 $tabs-navigation-font-size: rem-calc(14);
 .tabs-content {background:$light-gray;padding:5px 10px;margin-top:1px;}
@@ -248,7 +248,7 @@ $topbar-dropdown-link-bg: $mid-purple;
 // Set the link colors and styles for top-level nav
 
 $topbar-link-font-size: rem-calc(14);
-$topbar-link-bg-hover: $dark-purple;
-$topbar-link-bg-active: $dark-purple !default;
-$topbar-link-bg-active-hover: scale-color($dark-gray, $lightness: -14%);
+$topbar-link-bg-hover: $very-dark-purple;
+$topbar-link-bg-active: $very-dark-purple !default;
+$topbar-link-bg-active-hover: scale-color($very-dark-purple, $lightness: -14%);