diff --git a/hamburg-freifunk-wp-theme/README.md b/hamburg-freifunk-wp-theme/README.md index 43ba137..2536fab 100644 --- a/hamburg-freifunk-wp-theme/README.md +++ b/hamburg-freifunk-wp-theme/README.md @@ -1,6 +1,6 @@ hamburg-freifunk-wp-theme (2018) -FoundationPress relies to not-up-to-date dependencies, works with node.js ~6, use n to install older nodes +FoundationPress relies to not-up-to-date dependencies, works with node.js ~6, use n to install older version node.js $ n 6 @@ -12,6 +12,6 @@ $ ncu -u (install ncu with $ npm install -g npm-check-updates) -during design/development, render SCSS +during design/development, render SCSS etc $ npm start \ No newline at end of file diff --git a/hamburg-freifunk-wp-theme/header.php b/hamburg-freifunk-wp-theme/header.php index cd4b5ee..c8c8549 100644 --- a/hamburg-freifunk-wp-theme/header.php +++ b/hamburg-freifunk-wp-theme/header.php @@ -34,19 +34,43 @@ - + + + + + + + + \ No newline at end of file diff --git a/hamburg-freifunk-wp-theme/library/entry-meta.php b/hamburg-freifunk-wp-theme/library/entry-meta.php index cccca1c..7674aba 100644 --- a/hamburg-freifunk-wp-theme/library/entry-meta.php +++ b/hamburg-freifunk-wp-theme/library/entry-meta.php @@ -11,6 +11,6 @@ if ( ! function_exists( 'foundationpress_entry_meta' ) ) : /* translators: %1$s: current date, %2$s: current time */ echo '

'; echo ''; - echo '' . __( 'Written by', 'foundationpress' ) . '

'; + echo ' ' . __( 'Written by', 'foundationpress' ) . '

'; } endif; diff --git a/hamburg-freifunk-wp-theme/src/assets/images/hamburg_freifunk_net_logo__modified.svg b/hamburg-freifunk-wp-theme/src/assets/images/hamburg_freifunk_net_logo__modified.svg new file mode 100755 index 0000000..e475571 --- /dev/null +++ b/hamburg-freifunk-wp-theme/src/assets/images/hamburg_freifunk_net_logo__modified.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/hamburg-freifunk-wp-theme/src/assets/images/header/2012.12.31 29C3.jpg b/hamburg-freifunk-wp-theme/src/assets/images/header/2012.12.31 29C3.jpg new file mode 100755 index 0000000..c808bbc Binary files /dev/null and b/hamburg-freifunk-wp-theme/src/assets/images/header/2012.12.31 29C3.jpg differ diff --git a/hamburg-freifunk-wp-theme/src/assets/images/header/20150202_201457_Pano_k.jpg b/hamburg-freifunk-wp-theme/src/assets/images/header/20150202_201457_Pano_k.jpg new file mode 100755 index 0000000..04c3666 Binary files /dev/null and b/hamburg-freifunk-wp-theme/src/assets/images/header/20150202_201457_Pano_k.jpg differ diff --git a/hamburg-freifunk-wp-theme/src/assets/images/header/hamburg_freifunk_topomap_001.jpg b/hamburg-freifunk-wp-theme/src/assets/images/header/hamburg_freifunk_topomap_001.jpg new file mode 100755 index 0000000..2d0c1dd Binary files /dev/null and b/hamburg-freifunk-wp-theme/src/assets/images/header/hamburg_freifunk_topomap_001.jpg differ diff --git a/hamburg-freifunk-wp-theme/src/assets/images/header/hamburg_freifunk_topomap_002.jpg b/hamburg-freifunk-wp-theme/src/assets/images/header/hamburg_freifunk_topomap_002.jpg new file mode 100755 index 0000000..75586fc Binary files /dev/null and b/hamburg-freifunk-wp-theme/src/assets/images/header/hamburg_freifunk_topomap_002.jpg differ diff --git a/hamburg-freifunk-wp-theme/src/assets/scss/templates/freifunk.scss b/hamburg-freifunk-wp-theme/src/assets/scss/templates/freifunk.scss index 2196cf3..56e6889 100644 --- a/hamburg-freifunk-wp-theme/src/assets/scss/templates/freifunk.scss +++ b/hamburg-freifunk-wp-theme/src/assets/scss/templates/freifunk.scss @@ -18,51 +18,6 @@ h6 { text-transform: uppercase; font-weight: normal; } - -.title-bar-left { - padding-left: 10px; - .menu-icon { - width: 18px; - } - a { - font-size: 1.2rem; - } -} -.title-bar-title { - padding-left: 5px; - -} -.top-bar { - - .menu { - margin-right: 1rem; - li, li:not(:last-child) { - border-right: 0px solid #4e4e4e; - margin: 1rem 0; - a { - color: #e6e6e6; - padding: 1rem; - font-weight: normal; - font-size: 18px; - line-height: 1; - } - a::before { - content: url('../images/freifunk_pfeil.svg'); - display: inline-block; - color: #ffb400; - line-height: 0; - transform: scale(0.6); - vertical-align: -10px; - width: 38px; - @media screen and (max-width: 39.9375em) { - transform: scale(0.5); - vertical-align: -10px; - width: 42px; - } - } - } - } -} p, li, blockquote { margin-bottom: 1rem; font-size: inherit; @@ -76,7 +31,148 @@ p, li, blockquote { } +/* header/topbar */ + +.title-bar-left { + padding-left: 10px; + + .menu-icon { + width: 18px; + } + a { + font-size: 1.2rem; + } +} +.title-bar-title { + padding-left: 5px; +} + +.top-bar-outer { + background-color: #2C3840; + nav.top-bar { + + max-width: 90rem; + + margin: 0 auto; + + max-height: 75px; + + .top-bar-left { + min-width: 55rem; + margin-top: 50px; + .site-desktop-title.top-bar-title { + + font-size: 18px; + + a { + color: #e6e6e6; + font-size: inherit; + } + + #logo { + float: left; + border: 1px solid white; + + #logo-inner { + + margin-left: 74px; + + margin-top: 0; + + position: absolute; + -webkit-transform: rotate(34deg); + -ms-transform: rotate(34deg); + transform: rotate(34deg); + display: block; + + + img { + transform: scale(2.4); + } + } + + } + #title { + float: left; + margin-left: 330px; + h1 { + margin: 0; + font-size: 2.5rem; + a { + padding: 0; + font-weight: normal; + } + } + h2 { + font-size: 2.5rem; + margin: 0; + } + } + + + } + } + + .menu { + margin-right: 1rem; + li, li:not(:last-child), li:not(.menu-text) { + border-right: 0px solid #4e4e4e; + margin: 0; + + a { + color: #e6e6e6; + padding: 0.7rem; + font-weight: normal; + font-size: 18px; + line-height: 1; + background: transparent; + } + a:hover { + background-color: #42525D; + } + a::before { + content: url('../images/freifunk_pfeil.svg'); + display: inline-block; + color: #ffb400; + line-height: 0; + transform: scale(0.6); + vertical-align: -10px; + width: 38px; + @media screen and (max-width: 39.9375em) { + transform: scale(0.5); + vertical-align: -10px; + width: 42px; + } + } + } + + } + } +} +/* banner image */ + +#banner { + height: 300px; + overflow: hidden; + width: 100%; + + + img { + width: 120%; + max-width: 200%; + } +} + +/* main content */ + .main-container { + + margin-top: 275px; + + + .entry-content { + margin-bottom: 50px; + } a { color: $freifunk-color-magenta; border-bottom: 2px solid $freifunk-color-magenta; @@ -104,7 +200,7 @@ p, li, blockquote { display: inline-block; color: #ffb400; line-height: 0; - transform: scale(0.7); + transform: scale(0.82); vertical-align: -5px; width: 48px; @media screen and (max-width: 39.9375em) { @@ -132,6 +228,8 @@ p, li, blockquote { p.edit-link, p.byline.author { color: #644; + font-size: 15px; + @media screen and (max-width: 39.9375em) { font-size: 15px; } @@ -157,7 +255,7 @@ p, li, blockquote { display: block; ul { list-style-type: none; - margin-left: 0; + margin: 0 0 3.5rem -1.5rem; li { margin: 1.5rem 0; } @@ -202,4 +300,4 @@ p, li, blockquote { padding: 0; } } -} \ No newline at end of file +}