Add super css, fix nav and other components.

This commit is contained in:
Sam Lu
2018-07-31 17:33:07 -05:00
parent bb3adc37d3
commit 19f9734349
8 changed files with 64 additions and 15 deletions

View File

@@ -14,7 +14,7 @@
height: 160px
max-height: 160px
min-height: 160px
margin: 5px auto 0
margin: 0 auto
overflow: hidden
width: 100%
+media-breakpoint-up(sm)

View File

@@ -20,7 +20,7 @@
color: white
font-weight: 400
font-size: 48px
margin-bottom: 0
margin: 0
text-shadow: 0 2px 2px rgba(0, 0, 0, 0.30)
.lead
max-width: 722px

View File

@@ -1,18 +1,20 @@
.navbar
nav.navbar
background: #fff
height: auto
min-height: 48px
padding: .1rem 1rem
padding: 2px 20px
+media-breakpoint-up(md)
box-shadow: 0 2px 2px -2px rgba(0,0,0,.15)
height: 56px
padding: .5rem 1rem
padding: 10px 5px 10px 20px
&.sticky-top
+media-breakpoint-down(sm)
position: static
.logo
display: flex
justify-content: center
.navbar-brand
padding: .3125rem 0
.navbar-toggler
padding: 0
border-radius: 0
@@ -21,17 +23,26 @@
margin-top: 15px
+media-breakpoint-up(md)
margin: 0
li
line-height: 2.5
.special
top: 10px
left: 35px
.nav-item .nav-link
font-size: 18px
color: $dark
padding: 3vh 8px 3vh 34px
// padding: 3vh 8px 3vh 34px
padding: 10px
+media-breakpoint-up(lg)
padding: 6px 18px
&:hover
color: $muted
.navbar-toggler
border: 0
display: block
outline: none
+media-breakpoint-up(md)
display: none
span
width: 20px
height: 2px
@@ -48,12 +59,39 @@
display:none !important
&.show
padding-bottom: 75vh
.search-icon
display: flex
align-items: center
justify-content: center
padding: 0 8px
+media-breakpoint-up(lg)
padding: 0 16px
.pi-search
&::before
color: rgba(17,17,17,0.75)
font-size: 16px
.nav-notifications
display: flex
align-items: center
justify-content: center
padding: 0 8px
+media-breakpoint-up(lg)
padding: 0 16px
.navbar-item
height: auto
padding: 0
.nav-notifications-icon
color: rgba(17,17,17,0.75)
.gravatar
width: 32px
border-radius: 50%
#userDropdown
.nav-link
padding-top: 4px;
padding-bottom: 0;
padding-right: 0;
outline: none;
padding-top: 4px
padding-bottom: 0
padding-right: 0
outline: none
.navbar+.page-content
padding-top: 0
.container-page
background: #fff

View File

@@ -5,6 +5,9 @@ body
font-family: 'Source Sans Pro', sans-serif
-webkit-font-smoothing: antialiased
-moz-osx-font-smoothing: grayscale
color: #212529
h1, h2, h3, h4, h5
font-family: 'Source Sans Pro', sans-serif
h1
font-size: 48px
line-height: 57px
@@ -16,6 +19,7 @@ h3
line-height: 38px
h4
font-size 21px
font-weight: 500
line-height: 34px
h5
font-size: 15px

View File

@@ -17,6 +17,11 @@ meta(name="twitter:description", content="Blender Cloud is a web based service d
meta(property="og:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}")
meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}")
| {% endblock %}
| {% block css %}
| {{ super() }}
link(href="{{ url_for('static_cloud', filename='assets/css/projects-index-collection.css') }}", rel="stylesheet")
| {% endblock css %}
| {% block body %}
.dashboard-container

View File

@@ -137,8 +137,9 @@ html(lang="en")
a.nav-link(href="{{ url_for('cloud.services') }}",
class="{% if category == 'services' %}active{% endif %}") Services
//- li.nav-item
//- i.search-icon.pi-search
li.nav-item.search-icon
a.navbar-item
i.pi-search
| {% endblock navigation_sections %}
| {% if current_user.is_anonymous %}
@@ -149,8 +150,8 @@ html(lang="en")
| {% endif %}
| {% block navigation_user %}
//- | {% include 'menus/notifications.html' %}
//- | {% include 'menus/user.html' %}
| {% include 'menus/notifications.html' %}
| {% include 'menus/user.html' %}
| {% endblock navigation_user %}

View File

@@ -107,7 +107,7 @@ header
li.nav-item
a.nav-link(href="#", class="{% if title == 'team' %}active{% endif %}") Team
li.nav-item
a.nav-link(href="#", class="{% if title == 'gallery' %}active{% endif %}") Gallery
a.nav-link(href="/projects/gallery.html", class="{% if title == 'gallery' %}active{% endif %}") Gallery
li.nav-item
a.nav-link(href="#", class="{% if title == 'assets' %}active{% endif %}") Assets
li.nav-item

View File

@@ -34,6 +34,7 @@ meta(property="og:image", content="{{ page_header_image }}")
meta(name="twitter:image", content="{{ page_header_image }}")
| {% endblock %}
| {% block css %}
| {{ super() }}
link(href="{{ url_for('static_cloud', filename='assets/css/projects-index-collection.css') }}", rel="stylesheet")
| {% endblock css %}