Merge pull request #226 from Piratenpartei/dev

Dev
Piratenpartei · May 18, 2019 · 6aa55f4 · 6aa55f4
2 parents 4670ed7 + 92c7ba0
commit 6aa55f4
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 89 deletions.
diff --git a/css/sass/_variables.scss b/css/sass/_variables.scss
@@ -1,6 +1,6 @@
 
 // Thene Version
-$version:  '1.4.3';
+$version:  '1.4.5';
     // Theme Version
     // First Digit:  Manual
     // Second Digit: Branch Version

diff --git a/css/sass/elements/_colorsets.scss b/css/sass/elements/_colorsets.scss
@@ -209,10 +209,7 @@
 
 
 .footer-feature-btn:focus, 
-#comments-toggle:focus, 
-.footer-feature-btn:hover, 
-.comments-show #comments-toggle, 
-#comments-toggle:hover {
+.footer-feature-btn:hover {
   background: #0c6ca6;
 }
 
@@ -226,12 +223,7 @@
   background: #0c6ca6;
 }
 
-.comments-show #comments-toggle,
-#comments-toggle:focus,
-#comments-toggle:hover {
-  border-color: #0c6ca6;
-  color: #fff;
-}
+
 
 #primary #infinite-handle span:focus, 
 #front-section-three a.all-posts-link:focus, 
@@ -249,6 +241,9 @@
 //
 // Comments
 //
+
+
+
 #comments {
     #respond a#cancel-comment-reply-link,
     .comment-reply a {
@@ -293,8 +288,9 @@
 .comments-show #comments-toggle,
 #comments-toggle:focus,
 #comments-toggle:hover {
-    border-color: $color-linkhover;
+    border-color:  $color-main;
     color: #fff;
+    background: $color-main;
 }
 
 

diff --git a/css/sass/elements/_headlines.scss b/css/sass/elements/_headlines.scss
@@ -52,10 +52,12 @@ h1, h2, h3, h4, h5, h6,
     font-weight: 600;
 }
 
+p.site-title,
 h1.site-title {
     font-weight: bold;
-    padding-right: 55px;
-    @include px2rem($font-size-h1-sitetitle);
+    padding-right: 25px;
+    @include px2rem($font-size-base-sm);
+
 }
 
 
@@ -230,10 +232,16 @@ h3 {
 
 
 @media screen and (min-width: $breakpoint-sm) {
+    p.site-title,
+    h1.site-title {
+	padding-top: 5px;    
+    }
+
+
     .single-post .entry-header h1.entry-title, 
     .single-attachment .entry-header h1.entry-title, 
     .attachment h1.entry-title,
-    .page h1.entry-title {
+    h1.entry-title {
 	@include px2rem($font-size-h1-sitetitle-sm);     
     }
 

diff --git a/css/sass/elements/_social-media.scss b/css/sass/elements/_social-media.scss
@@ -34,6 +34,7 @@
                     @include px2rem($font-size-socialmedia-icon);
 		    text-align: center;
 		    vertical-align: middle;
+                    padding-top: 1px;
 		}
 
 
@@ -116,16 +117,7 @@
                 &[href*="google.com"]:hover {
                     background-color: darken(#4285f4,10%);
                 }
-		&[href*="plus.google.com"] {
-		    @extend .fa-google-plus;
-                    background-color: #dd4b39;
-                    border-color: #dd4b39;
-                    color: white;
-                }  
-                 &[href*="plus.google.com"]:focus,
-                &[href*="plus.google.com"]:hover {
-                    background-color: darken(#dd4b39,20%);
-                }
+
 
 		&[href*="github.com"] {
 		    @extend .fa-github;

diff --git a/css/sass/structure/_header.scss b/css/sass/structure/_header.scss
@@ -22,6 +22,9 @@
     z-index: 21;
     background: #fff;
 
+   @media screen and (min-width: $breakpoint-sm) {
+        min-height: 46px;
+    }
     @media screen and (min-width: $breakpoint-1060) {
 	position: relative;
 	width: 87.5%;

diff --git a/css/sass/structure/_main.scss b/css/sass/structure/_main.scss
@@ -1,11 +1,12 @@
-/*-----------------------------------------------------------------------------------*/
-/* Main
-/*-----------------------------------------------------------------------------------*/
-
-main {
-    position: relative;
-    top: 59px;
-    @media screen and (min-width: 1024px) {
-              top: 0;
-    }
+/*-----------------------------------------------------------------------------------*/
+/* Main
+/*-----------------------------------------------------------------------------------*/
+
+main {
+    position: relative;
+    top: 59px;
+
+    @media screen and (min-width: 1024px) {
+              top: 0;
+    }
 }
diff --git a/css/sass/structure/_menus.scss b/css/sass/structure/_menus.scss
@@ -179,46 +179,6 @@
 }
 
 
-/* --- Skiplinks --- */
-#skiplinks{
-    position: relative;
-    left: 0;
-    width: 100%;
-    margin-left: 0;
-    text-align: center;
-    list-style: outside none;
-
-    ul {
-	margin: 0;
-    }
-    li  { 
-        list-style-type: none;
-    }
-    a{
-	position: absolute;
-	left: -99999px;
-	top: 150px;
-    }
-    a:focus, 
-    a:active{  
-        @include px2rem($font-size-base);
-	position: relative;
-	display: block;
-	z-index:9999;
-	height: auto;
-	margin: 0 auto;
-	text-align: center;
-	text-decoration: none;
-        color: #fff;
-	background: $color-second;
-	left: 0;
-	top: 0;
-    }
-}
-
-
-
-
 @media screen and (min-width: $breakpoint-1024) {
     #desktop-navigation {
 	display: block;
@@ -268,7 +228,7 @@
 		    li:focus > ul,  
 		    li:hover > ul {
 			top: 15px;
-			left: 215px;
+			left: 75px;
 
 			li > ul.focus,
 			li.focus > ul, 
@@ -316,7 +276,42 @@
 	}
       }
   }
-
-
-
 
+
+
+/* --- Skiplinks --- */
+#skiplinks{
+    position: relative;
+    left: 0;
+    width: 100%;
+    margin-left: 0;
+    text-align: center;
+    list-style: outside none;
+
+    ul {
+	margin: 0;
+    }
+    li  { 
+        list-style-type: none;
+    }
+    a{
+	position: absolute;
+	left: -99999px;
+	top: 150px;
+    }
+    a:focus, 
+    a:active{  
+        @include px2rem($font-size-base);
+	position: relative;
+	display: block;
+	z-index:9999;
+	height: auto;
+	margin: 0 auto;
+	text-align: center;
+	text-decoration: none;
+        color: #fff;
+	background: $color-second;
+	left: 0;
+	top: 0;
+    }
+}
diff --git a/css/sass/structure/_off-canvas.scss b/css/sass/structure/_off-canvas.scss
@@ -6,15 +6,17 @@
 #overlay-open, 
 #overlay-close {
     position: absolute;
-    top: 8px;
+    top: 0;
     right: 5.3125%;
-    width: 40px;
+    width: 30px;
     height: 40px;
 
     .no-js & {
         display: none;
     }
-
+  @media screen and (min-width: $breakpoint-sm) {
+       top: 8px;
+  }
 }
 
 #overlay-open {
@@ -34,7 +36,7 @@
     margin: 0;
     padding: 0;
     z-index: 9999;
-    text-align: right;
+
     background: transparent;
     line-height: 1;
     opacity: 1;
@@ -76,7 +78,10 @@
 
 
 /* --- Overlay Widget Area --- */
-
+.overlay-title-wrap {
+    padding: 15px 5.3125%;
+    background: #f5f5f6;
+}
 .inner-offcanvas-wrap {
     width: 100%;
     display: block;

diff --git a/css/sass/structure/_pagination.scss b/css/sass/structure/_pagination.scss
@@ -129,9 +129,18 @@
             display: block;
             margin: 20px 0;
 
-            .nav-next, .nav-previous {
-                display: inline-block;
+            .nav-next, 
+            .nav-previous {
+                display: inline;
             }
+
+            .nav-next {
+                text-align: right;
+                @media screen and (min-width:$breakpoint-sm) {
+                    text-align: left;
+                }
+            } 
+
     }
 
     .pagebreak-links {
@@ -145,13 +154,28 @@
         a {
             padding: 5px;
             margin-right: 5px;
+            margin-top: 5px;
+
+
+            width: 100%;
+            display: block;
+            @media screen and (min-width:$breakpoint-sm) {
+                width: inherit;
+                display: inline;             
+            }
         }
         .next,
         .prev {
             padding: 2px 4px;
 
         }
-
+        .next {
+            text-align: right;
+            @media screen and (min-width:$breakpoint-sm) {
+                text-align: left;
+            }
+        } 
+
         .next:after {
            margin-left: 5px;
            @extend .fa;

diff --git a/style.css b/style.css