Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Switch to more idiomatic Sass usage #1751

Merged
merged 3 commits into from
Aug 7, 2019
Merged

Switch to more idiomatic Sass usage #1751

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
463f51a
Use scss folder and covert application.scss to proper SCSS
lucperkins Aug 1, 2019
59d4b0d
Revert directory name change
lucperkins Aug 1, 2019
d78af07
Merge branch 'development' into lperkins/scss-fixes
markbates Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 96 additions & 81 deletions genny/assets/webpack/templates/assets/css/_buffalo.scss.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,118 +1,133 @@
.container {
min-width: 320px;
min-width: 320px;
}

header {
background-color: #62a5ee;
padding: 10px 20px;
box-sizing: border-box;
background-color: #62a5ee;
padding: 10px 20px;
box-sizing: border-box;
}

.logo img {
width: 80px;
.logo {
img {
width: 80px;
}
}

.titles h1 {
font-size: 30px;
font-weight: 300;
color: white;
margin-bottom: 13px;
margin-top: 5px;
}
.titles {
h1 {
font-size: 30px;
font-weight: 300;
color: white;
margin-bottom: 13px;
margin-top: 5px;
}

.titles h2 {
font-weight: 300;
font-size: 18px;
display: inline-block;
margin: 0;
}
h2 {
font-weight: 300;
font-size: 18px;
display: inline-block;
margin: 0;
}

.titles a {
color: white;
text-decoration: underline;
}
a {
color: white;
text-decoration: underline;
}

.titles i {
margin-right: 5px;
text-decoration: none;
}
i {
margin-right: 5px;
text-decoration: none;
}

.titles .documentation {
margin-left: 28px;
.documentation {
margin-left: 28px;
}
}

.subtitle {
color: white;
margin: 0;
padding: 13px 0;
background-color: #2a3543;
margin-bottom: 20px;
}
color: white;
margin: 0;
padding: 13px 0;
background-color: #2a3543;
margin-bottom: 20px;

.subtitle h3 {
font-size: 22px;
font-weight: 400;
margin: 0;
h3 {
font-size: 22px;
font-weight: 400;
margin: 0;
}
}

table {
font-size: 14px;
}
font-size: 14px;

table.table tbody tr td {
border-top: 0;
padding: 10px;
&.table tbody tr td {
border-top: 0;
padding: 10px;
}
}

.foot {
text-align: right;
color: #c5c5c5;
font-weight: 300;
}
text-align: right;
color: #c5c5c5;
font-weight: 300;

.foot a {
color: #8b8b8b;
text-decoration: underline;
a {
color: #8b8b8b;
text-decoration: underline;
}
}

.centered {
text-align: center;
text-align: center;
}

@media all and (max-width: 770px) {
.titles h1 {
font-size: 25px;
margin: 15px 0 5px 0;
}
.titles {
h1 {
font-size: 25px;
margin: 15px 0 5px 0;
}
}
}

@media all and (max-width: 640px) {
.titles h1 {
font-size: 23px;
margin: 15px 0 5px 0;
}
.titles h2 {
font-size: 15px;
}
.titles .documentation {
margin-left: 10px;
}
.titles {
h1 {
font-size: 23px;
margin: 15px 0 5px 0;
}

h2 {
font-size: 15px;
}

.documentation {
margin-left: 10px;
}
}
}

@media all and (max-width: 530px) {
.titles h1 {
font-size: 20px;
margin: 5px 0;
}
.logo {
padding: 0
}
.logo img {
width: 100%
}
.titles .documentation {
margin-left: 0px;
margin-top: 5px;
display: block;
}
.titles {
h1 {
font-size: 20px;
margin: 5px 0;
}

.documentation {
margin-left: 0px;
margin-top: 5px;
display: block;
}
}

.logo {
padding: 0;

img {
width: 100%
}
}
}
2 changes: 1 addition & 1 deletion genny/assets/webpack/templates/assets/css/application.scss.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~bootstrap/scss/bootstrap.scss";
@import "~@fortawesome/fontawesome-free/css/all.min.css";

@import "buffalo"
@import "buffalo";
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/gobuffalo/buffalo
go 1.12

require (
cloud.google.com/go v0.36.0 // indirect
github.com/BurntSushi/toml v0.3.1
github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.7.0
Expand Down