Polish nav for all pages. Fix hover dropdowns, notification, profile menu
This commit is contained in:
@@ -1,11 +1,9 @@
|
|||||||
|
@import ../styles/colors
|
||||||
|
@import ../styles/breakpoints
|
||||||
|
|
||||||
footer.container-fluid
|
footer.container-fluid
|
||||||
background: #F8F8FB
|
background: #F8F8FB
|
||||||
border-top: 1px solid #E3E3E6
|
border-top: 1px solid #E3E3E6
|
||||||
margin-top: 72px
|
|
||||||
+media-breakpoint-up(sm)
|
|
||||||
margin-top: 112px
|
|
||||||
+media-breakpoint-up(lg)
|
|
||||||
margin-top: 136px
|
|
||||||
.container
|
.container
|
||||||
margin-top: 11px
|
margin-top: 11px
|
||||||
max-width: 1200px
|
max-width: 1200px
|
||||||
|
@@ -1,3 +1,6 @@
|
|||||||
|
@import ../styles/colors
|
||||||
|
@import ../styles/breakpoints
|
||||||
|
|
||||||
.gallery
|
.gallery
|
||||||
.cta-arrow
|
.cta-arrow
|
||||||
margin-top: 20px
|
margin-top: 20px
|
||||||
|
@@ -1,3 +1,6 @@
|
|||||||
|
@import ../styles/colors
|
||||||
|
@import ../styles/breakpoints
|
||||||
|
|
||||||
.jumbotron
|
.jumbotron
|
||||||
background-color: #fff
|
background-color: #fff
|
||||||
background-repeat: no-repeat
|
background-repeat: no-repeat
|
||||||
|
@@ -1,3 +1,6 @@
|
|||||||
|
@import ../styles/colors
|
||||||
|
@import ../styles/breakpoints
|
||||||
|
|
||||||
.nav-scroller
|
.nav-scroller
|
||||||
position: relative
|
position: relative
|
||||||
z-index: 2
|
z-index: 2
|
||||||
|
@@ -1,3 +1,6 @@
|
|||||||
|
@import ../styles/colors
|
||||||
|
@import ../styles/breakpoints
|
||||||
|
|
||||||
nav.navbar
|
nav.navbar
|
||||||
background: #fff
|
background: #fff
|
||||||
height: auto
|
height: auto
|
||||||
@@ -19,6 +22,8 @@ nav.navbar
|
|||||||
.navbar-toggler
|
.navbar-toggler
|
||||||
padding: 0
|
padding: 0
|
||||||
border-radius: 0
|
border-radius: 0
|
||||||
|
&:hover
|
||||||
|
background: none
|
||||||
.navbar-nav
|
.navbar-nav
|
||||||
margin-bottom: 15px
|
margin-bottom: 15px
|
||||||
margin-top: 15px
|
margin-top: 15px
|
||||||
@@ -29,10 +34,37 @@ nav.navbar
|
|||||||
.special
|
.special
|
||||||
top: 10px
|
top: 10px
|
||||||
left: 35px
|
left: 35px
|
||||||
|
a.navbar-item.active,
|
||||||
|
a.navbar-item.active:hover,
|
||||||
|
a.navbar-item:hover
|
||||||
|
box-shadow: none
|
||||||
|
li:last-of-type
|
||||||
|
// profile menu
|
||||||
|
.dropdown-menu
|
||||||
|
right: 0
|
||||||
|
left: auto
|
||||||
|
min-width: 10rem
|
||||||
|
padding: .5rem 0
|
||||||
|
margin: -1px 0 0
|
||||||
|
font-size: 1rem
|
||||||
|
color: #111
|
||||||
|
text-align: left
|
||||||
|
list-style: none
|
||||||
|
background-color: #fff
|
||||||
|
background-clip: padding-box
|
||||||
|
border: 1px solid rgba(0,0,0,.15)
|
||||||
|
border-radius: .25rem
|
||||||
|
li:hover
|
||||||
|
background-color: #f8f9fa
|
||||||
|
.dropdown ul.dropdown-menu li a
|
||||||
|
color: #111
|
||||||
|
font-family: 'Source Sans Pro', sans-serif
|
||||||
|
&:hover
|
||||||
|
color: #111
|
||||||
|
text-decoration: none
|
||||||
.nav-item .nav-link
|
.nav-item .nav-link
|
||||||
font-size: 18px
|
font-size: 18px
|
||||||
color: $dark
|
color: $dark
|
||||||
// padding: 3vh 8px 3vh 34px
|
|
||||||
padding: 10px
|
padding: 10px
|
||||||
+media-breakpoint-up(lg)
|
+media-breakpoint-up(lg)
|
||||||
padding: 6px 18px
|
padding: 6px 18px
|
||||||
@@ -81,15 +113,35 @@ nav.navbar
|
|||||||
.navbar-item
|
.navbar-item
|
||||||
height: auto
|
height: auto
|
||||||
padding: 0
|
padding: 0
|
||||||
|
.active
|
||||||
|
box-shadow: 0
|
||||||
|
.flyout
|
||||||
|
background-color: #fff
|
||||||
|
background-clip: padding-box
|
||||||
|
border: 1px solid rgba(0,0,0,.15)
|
||||||
|
border-radius: .25rem
|
||||||
|
box-shadow: 0
|
||||||
|
font-size: 16px
|
||||||
|
.flyout.notifications
|
||||||
|
right: 65px
|
||||||
|
top: 57px
|
||||||
|
.nav-notifications:hover>#notifications-toggle
|
||||||
|
display: block
|
||||||
.nav-notifications-icon
|
.nav-notifications-icon
|
||||||
color: rgba(17,17,17,0.75)
|
color: rgba(17,17,17,0.75)
|
||||||
.gravatar
|
.gravatar
|
||||||
width: 32px
|
width: 32px
|
||||||
border-radius: 50%
|
border-radius: 50%
|
||||||
.dropdown-menu
|
.dropdown-menu
|
||||||
margin-top: -2px
|
margin-top: -1px
|
||||||
.dropdown:hover>.dropdown-menu
|
.dropdown:hover>.dropdown-menu
|
||||||
display: block
|
display: block
|
||||||
|
.dropdown-item
|
||||||
|
color: #111
|
||||||
|
font-size: 18px
|
||||||
|
padding: 4px 8px
|
||||||
|
i
|
||||||
|
padding-right: 8px
|
||||||
#userDropdown
|
#userDropdown
|
||||||
.nav-link
|
.nav-link
|
||||||
padding-top: 4px
|
padding-top: 4px
|
||||||
|
@@ -1,8 +1,12 @@
|
|||||||
|
/* mixins reused on every page
|
||||||
|
================================================================== */
|
||||||
|
@import ../styles/typography
|
||||||
|
@import ../styles/navbar
|
||||||
|
@import ../styles/footer
|
||||||
|
|
||||||
|
|
||||||
/* Undo Old Base.css, main.css
|
/* Undo Old Base.css, main.css
|
||||||
================================================================== */
|
================================================================== */
|
||||||
body,
|
|
||||||
.container-page
|
|
||||||
background: #fff
|
|
||||||
.container
|
.container
|
||||||
width: 100%
|
width: 100%
|
||||||
padding-right: 15px
|
padding-right: 15px
|
@@ -1,17 +1,16 @@
|
|||||||
@import ../styles/colors
|
@import ../styles/colors
|
||||||
@import ../styles/breakpoints
|
@import ../styles/breakpoints
|
||||||
@import ../styles/typography
|
|
||||||
@import ../styles/base
|
|
||||||
@import ../styles/navbar
|
|
||||||
@import ../styles/jumbotron
|
@import ../styles/jumbotron
|
||||||
@import ../styles/navbar-secondary
|
@import ../styles/navbar-secondary
|
||||||
@import ../styles/iframe
|
@import ../styles/iframe
|
||||||
@import ../styles/gallery
|
@import ../styles/gallery
|
||||||
@import ../styles/cards
|
@import ../styles/cards
|
||||||
@import ../styles/footer
|
|
||||||
|
|
||||||
/* Undo main.css padding
|
/* Undo main.css padding
|
||||||
================================================================== */
|
================================================================== */
|
||||||
|
body,
|
||||||
|
.container-page
|
||||||
|
background: #fff
|
||||||
section.node-details-container.project
|
section.node-details-container.project
|
||||||
padding-bottom: 0
|
padding-bottom: 0
|
||||||
.node-details-title
|
.node-details-title
|
||||||
@@ -46,3 +45,9 @@ section
|
|||||||
.card
|
.card
|
||||||
.card-image
|
.card-image
|
||||||
margin-top: 0
|
margin-top: 0
|
||||||
|
footer.container-fluid
|
||||||
|
margin-top: 72px
|
||||||
|
+media-breakpoint-up(sm)
|
||||||
|
margin-top: 112px
|
||||||
|
+media-breakpoint-up(lg)
|
||||||
|
margin-top: 136px
|
@@ -1,9 +1,15 @@
|
|||||||
@import ../styles/colors
|
@import ../styles/colors
|
||||||
@import ../styles/breakpoints
|
@import ../styles/breakpoints
|
||||||
@import ../styles/typography
|
|
||||||
@import ../styles/base
|
|
||||||
@import ../styles/navbar
|
|
||||||
@import ../styles/jumbotron
|
@import ../styles/jumbotron
|
||||||
@import ../styles/navbar-secondary
|
@import ../styles/navbar-secondary
|
||||||
@import ../styles/cards
|
@import ../styles/cards
|
||||||
@import ../styles/footer
|
|
||||||
|
body,
|
||||||
|
.container-page
|
||||||
|
background: #fff
|
||||||
|
footer.container-fluid
|
||||||
|
margin-top: 72px
|
||||||
|
+media-breakpoint-up(sm)
|
||||||
|
margin-top: 112px
|
||||||
|
+media-breakpoint-up(lg)
|
||||||
|
margin-top: 136px
|
29
src/styles/welcome.sass
Normal file
29
src/styles/welcome.sass
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
@import ../styles/colors
|
||||||
|
@import ../styles/breakpoints
|
||||||
|
|
||||||
|
nav.navbar
|
||||||
|
+media-breakpoint-up(md)
|
||||||
|
padding: 10px 10px 10px 20px
|
||||||
|
.nav-item-sign-in
|
||||||
|
line-height: 1.5
|
||||||
|
display: flex
|
||||||
|
align-items: center
|
||||||
|
justify-content: center
|
||||||
|
.navbar-item
|
||||||
|
.join .navbar .nav-item-sign-in a.navbar-item
|
||||||
|
background: $primary
|
||||||
|
font-size: 16px
|
||||||
|
font-weight: 600
|
||||||
|
margin: 0
|
||||||
|
padding: 8px 16px
|
||||||
|
width: 100%
|
||||||
|
&:hover
|
||||||
|
background: $primary
|
||||||
|
+media-breakpoint-up(md)
|
||||||
|
width: auto
|
||||||
|
// temporarily restore old primary color
|
||||||
|
h2,
|
||||||
|
h3
|
||||||
|
color: #68B3C8
|
||||||
|
footer.container-fluid
|
||||||
|
margin-top: 0
|
@@ -17,11 +17,6 @@ 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(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 %}")
|
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 %}
|
| {% endblock %}
|
||||||
| {% block css %}
|
|
||||||
| {{ super() }}
|
|
||||||
link(href="{{ url_for('static_cloud', filename='assets/css/projects-index-collection.css') }}", rel="stylesheet")
|
|
||||||
| {% endblock css %}
|
|
||||||
|
|
||||||
|
|
||||||
| {% block body %}
|
| {% block body %}
|
||||||
.dashboard-container
|
.dashboard-container
|
||||||
|
@@ -59,6 +59,8 @@ html(lang="en")
|
|||||||
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
|
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
|
||||||
| {% else %}
|
| {% else %}
|
||||||
link(href="{{ url_for('static_cloud', filename='assets/css/main.css') }}", rel="stylesheet")
|
link(href="{{ url_for('static_cloud', filename='assets/css/main.css') }}", rel="stylesheet")
|
||||||
|
link(href="{{ url_for('static_cloud', filename='assets/css/base.css') }}", rel="stylesheet")
|
||||||
|
|
||||||
| {% endif %}
|
| {% endif %}
|
||||||
| {% endblock css %}
|
| {% endblock css %}
|
||||||
|
|
||||||
|
@@ -11,6 +11,10 @@ meta(property="og:title", content="Blender Cloud - Open Content Production Platf
|
|||||||
meta(property="og:url", content="https://cloud.blender.org/")
|
meta(property="og:url", content="https://cloud.blender.org/")
|
||||||
meta(property="og:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_dweebs_01.jpg')}}")
|
meta(property="og:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_dweebs_01.jpg')}}")
|
||||||
| {% endblock og %}
|
| {% endblock og %}
|
||||||
|
| {% block css %}
|
||||||
|
| {{ super() }}
|
||||||
|
link(href="{{ url_for('static_cloud', filename='assets/css/welcome.css') }}", rel="stylesheet")
|
||||||
|
| {% endblock css %}
|
||||||
|
|
||||||
| {% block page_overlay %}
|
| {% block page_overlay %}
|
||||||
#page-overlay.video
|
#page-overlay.video
|
||||||
@@ -19,12 +23,10 @@ meta(property="og:image", content="{{ url_for('static', filename='assets/img/bac
|
|||||||
|
|
||||||
| {% block navigation_search %}{% endblock %}
|
| {% block navigation_search %}{% endblock %}
|
||||||
| {% block navigation_sections %}
|
| {% block navigation_sections %}
|
||||||
li
|
li.nav-item
|
||||||
a.navbar-item(href="{{ url_for('main.main_blog') }}")
|
a.nav-link(href="{{ url_for('main.main_blog') }}") Blog
|
||||||
span Blog
|
li.nav-item
|
||||||
li
|
a.nav-link(href="#pricing") Pricing
|
||||||
a.navbar-item(href="#pricing")
|
|
||||||
span Pricing
|
|
||||||
| {% endblock navigation_sections %}
|
| {% endblock navigation_sections %}
|
||||||
|
|
||||||
| {% block navigation_user %}
|
| {% block navigation_user %}
|
||||||
|
Reference in New Issue
Block a user