archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Fix sass to override old base and main on all pages and mobile views

Browse Source
This commit is contained in:
Sam Lu
2018-07-31 23:57:25 -05:00
parent 19f9734349
commit 515ef5e1b5
8 changed files with 106 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/styles/_cards.sass
View File

@@ -18,7 +18,6 @@
overflow: hidden overflow: hidden
width: 100% width: 100%
+media-breakpoint-up(sm) +media-breakpoint-up(sm)
margin-bottom: 10px
height: 203px height: 203px
max-height: 203px max-height: 203px
min-height: 203px min-height: 203px

6
src/styles/_footer.sass
View File

@@ -45,6 +45,12 @@ footer.container-fluid
a a
color: #6d6d6e color: #6d6d6e
font-size: 16px font-size: 16px
&:hover
color: #3F3F40
.social-icons .social-icons
.list-inline-item:not(:last-child) .list-inline-item:not(:last-child)
margin-right: 22px margin-right: 22px
a
opacity: 1
&:hover
opacity: 0.8

9
src/styles/_navbar.sass
View File

@@ -3,6 +3,7 @@ nav.navbar
height: auto height: auto
min-height: 48px min-height: 48px
padding: 2px 20px padding: 2px 20px
position: sticky
+media-breakpoint-up(md) +media-breakpoint-up(md)
box-shadow: 0 2px 2px -2px rgba(0,0,0,.15) box-shadow: 0 2px 2px -2px rgba(0,0,0,.15)
height: 56px height: 56px
@@ -85,13 +86,13 @@ nav.navbar
.gravatar .gravatar
width: 32px width: 32px
border-radius: 50% border-radius: 50%
.dropdown-menu
margin-top: -2px
.dropdown:hover>.dropdown-menu
display: block
#userDropdown #userDropdown
.nav-link .nav-link
padding-top: 4px padding-top: 4px
padding-bottom: 0 padding-bottom: 0
padding-right: 0 padding-right: 0
outline: none outline: none
.navbar+.page-content
padding-top: 0
.container-page
background: #fff

13
src/styles/_typography.sass
View File

@@ -8,15 +8,20 @@ body
color: #212529 color: #212529
h1, h2, h3, h4, h5 h1, h2, h3, h4, h5
font-family: 'Source Sans Pro', sans-serif font-family: 'Source Sans Pro', sans-serif
margin-top: 0
margin-bottom: .5rem
h1 h1
font-size: 48px font-size: 48px
line-height: 57px line-height: 57px
font-weight: 500
h2 h2
font-size: 36px font-size: 36px
line-height: 47px line-height: 47px
font-weight: 500
h3 h3
font-size: 27px font-size: 27px
line-height: 38px line-height: 38px
font-weight: 500
h4 h4
font-size 21px font-size 21px
font-weight: 500 font-weight: 500
@@ -26,7 +31,13 @@ h5
letter-spacing: 0.6px letter-spacing: 0.6px
p p
font-size: 20px font-size: 20px
line-height: 32px line-height: 1.5
margin-bottom: 1rem
.lead .lead
font-size: 20px font-size: 20px
letter-spacing: 0.4px letter-spacing: 0.4px
a
color: #007bff
&:hover
color: #007bff
text-decoration: underline

16
src/styles/project-landing.sass
View File

@@ -1,6 +1,7 @@
@import ../styles/colors @import ../styles/colors
@import ../styles/breakpoints @import ../styles/breakpoints
@import ../styles/typography @import ../styles/typography
@import ../styles/base
@import ../styles/navbar @import ../styles/navbar
@import ../styles/jumbotron @import ../styles/jumbotron
@import ../styles/navbar-secondary @import ../styles/navbar-secondary
@@ -9,6 +10,16 @@
@import ../styles/cards @import ../styles/cards
@import ../styles/footer @import ../styles/footer
/* Undo main.css padding
================================================================== */
section.node-details-container.project
padding-bottom: 0
.node-details-title
padding-top: 0
padding-bottom: 0
/* Landing Page Sass
================================================================== */
.cta-arrow .cta-arrow
img img
padding-left: 11px padding-left: 11px
@@ -17,8 +28,9 @@
max-width: 1190px max-width: 1190px
h1, h1,
p p
max-width: 730px max-width: 700px
margin: auto margin-left: auto
margin-right: auto
section section
margin-top: 104px margin-top: 104px
+media-breakpoint-up(sm) +media-breakpoint-up(sm)

1
src/styles/projects-index-collection.sass
View File

@@ -1,6 +1,7 @@
@import ../styles/colors @import ../styles/colors
@import ../styles/breakpoints @import ../styles/breakpoints
@import ../styles/typography @import ../styles/typography
@import ../styles/base
@import ../styles/navbar @import ../styles/navbar
@import ../styles/jumbotron @import ../styles/jumbotron
@import ../styles/navbar-secondary @import ../styles/navbar-secondary

129
src/templates/layout.pug
View File

@@ -164,72 +164,71 @@ html(lang="en")
| {% block body %}{% endblock %} | {% block body %}{% endblock %}
| {% block footer_container %} | {% block footer_container %}
footer#footer-container.container-fluid footer.container-fluid
| {% block footer_navigation %} | {% block footer_navigation %}
#footer-navigation .container.py-5
.container.py-5 .row
.row .col-4
.col-4 h5 Blender Cloud
h5 Blender Cloud p A creative hub for your projects, powered by free and open source software.
p A creative hub for your projects, powered by free and open source software. ul.list-inline.social-icons
ul.list-inline.social-icons li.list-inline-item
li.list-inline-item a(href="https://www.facebook.com/BlenderCloudOfficial/")
a(href="https://www.facebook.com/BlenderCloudOfficial/") img(src="../../static/assets/img/icons/icon-social-facebook.svg", alt="alt")
img(src="../../static/assets/img/icons/icon-social-facebook.svg", alt="alt") li.list-inline-item
li.list-inline-item a(href="https://twitter.com/Blender_Cloud")
a(href="https://twitter.com/Blender_Cloud") img(src="../../static/assets/img/icons/icon-social-twitter.svg", alt="alt")
img(src="../../static/assets/img/icons/icon-social-twitter.svg", alt="alt") li.list-inline-item
li.list-inline-item a(href="https://www.youtube.com/channel/UC5qvW9fotdsSJkCguB_t-kQ")
a(href="https://www.youtube.com/channel/UC5qvW9fotdsSJkCguB_t-kQ") img(src="../../static/assets/img/icons/icon-social-youtube.svg", alt="alt")
img(src="../../static/assets/img/icons/icon-social-youtube.svg", alt="alt") .col
.col h5 Libraries
h5 Libraries ul.list-unstyled.text-small
ul.list-unstyled.text-small li
li a(href="#") HDRI
a(href="#") HDRI li
li a(href="#") Textures
a(href="#") Textures li
li a(href="#") Characters
a(href="#") Characters .col
.col h5 Training
h5 Training ul.list-unstyled.text-small
ul.list-unstyled.text-small li
li a(href="#") Art Gallery
a(href="#") Art Gallery li
li a(href="#") Courses
a(href="#") Courses li
li a(href="#") Workshops
a(href="#") Workshops .col
.col h5 Resources
h5 Resources ul.list-unstyled.text-small
ul.list-unstyled.text-small li
li a(href="https://www.blender.org") Blender
a(href="https://www.blender.org") Blender li
li a(href="https://store.blender.org/") Blender Store
a(href="https://store.blender.org/") Blender Store li
li a(href="#") Contact Us
a(href="#") Contact Us li
li a(href="{{ url_for('cloud.terms_and_conditions') }}") Terms and Conditions
a(href="{{ url_for('cloud.terms_and_conditions') }}") Terms and Conditions li
li a(href="{{ url_for('cloud.privacy') }}") Privacy
a(href="{{ url_for('cloud.privacy') }}") Privacy .col
.col h5 Services
h5 Services ul.list-unstyled.text-small
ul.list-unstyled.text-small li
li a(href="#") Attract
a(href="#") Attract li
li a(href="#") Blender Cloud Add-on
a(href="#") Blender Cloud Add-on li
li a(href="#") Blender Sync
a(href="#") Blender Sync li
li a(href="#") Flamenco
a(href="#") Flamenco li
li a(href="#") Image Sharing
a(href="#") Image Sharing li
li a(href="#") Private Projects
a(href="#") Private Projects li
li a(href="#") Texture Browser
a(href="#") Texture Browser
| {% endblock footer_navigation %} | {% endblock footer_navigation %}
//- Scroll Up Arrow. Not sure if it's necessary //- Scroll Up Arrow. Not sure if it's necessary

3
src/templates/projects/landing.pug
View File

@@ -78,8 +78,7 @@ script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-hotke
| {% endblock %} | {% endblock %}
| {% block css %} | {% block css %}
link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet") | {{ super() }}
//- link(href="{{ url_for('static_pillar', filename='assets/css/base.css') }}", rel="stylesheet")
link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css') }}", rel="stylesheet") link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css') }}", rel="stylesheet")
| {% endblock %} | {% endblock %}