Merge remote-tracking branch 'upstream/pull/4724'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1500506154e22fc03ecabfb6f71fc7660659d18e..ca9a820f9780b58a4329bbaf861ecb1ea64c331f 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -15,10 +15,6 @@ p > img {
   max-width: 100%;
 }
 
-small, aside {
-  font-size: 12px;
-}
-
 time[title] {
   text-decoration: underline dotted;
 }

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index cc1d55eccbdf5309b66d84061373119ac9019f6b..07549d69bb33e939238f98e6ef6d1e44eea4a816 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -4,11 +4,9 @@ $typeheight: 14px;
 
 $blue: #7092FF;
 $secondary: #888;
-$lightblue: #B8C5F0;
 $green: #7ebc6f;
 $vibrant-green: #76c551;
 $grey: #CCC;
-$lightgrey: #EEE;
 $darkgrey: #888;
 $headerHeight: 55px;
 $sidebarWidth: 350px;