Skip to content

Commit

Permalink
#1679 More changes to Typography
Browse files Browse the repository at this point in the history
  • Loading branch information
Studio384 committed Jul 18, 2018
1 parent 50c1870 commit 652805d
Show file tree
Hide file tree
Showing 21 changed files with 145 additions and 360 deletions.
20 changes: 0 additions & 20 deletions themes/Typography/css/_accents.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,25 +151,5 @@
}
}
}

.title-block {
&.title-block-primary {
background-color: $accent;
}
}

.tab-set > .table-responsive > .table {
&:last-child {
border-color: $accent;
}
}

.tab-content {
border: .1rem solid $accent;
}

.tab-footer {
background-color: $accent;
}
}
}
5 changes: 4 additions & 1 deletion themes/Typography/css/_comment.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.comment {
border: 1px solid #eee;
border: none;
background: #fafafa;
padding: .75rem;
margin-bottom: .75rem;

Expand Down Expand Up @@ -53,6 +54,8 @@
}

.comment-header {
padding-bottom: .75rem;

img {
height: 3.78rem;
width: auto;
Expand Down
6 changes: 5 additions & 1 deletion themes/Typography/css/_container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

&.main {
background-color: #fff;
padding: 0 .25rem .75rem;
padding: 0 .75rem .75rem;

&.index {
padding: .75rem;
}
}

@media (max-width: 576px) { //SM
Expand Down
2 changes: 1 addition & 1 deletion themes/Typography/css/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
footer {
color: #fff;
background-color: #333;
border-bottom: #222 9px solid;
border-bottom: #222 12px solid;

a {
color: inherit !important;
Expand Down
10 changes: 5 additions & 5 deletions themes/Typography/css/_jumbotron.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.jumbotron {
border-radius: 0;
margin-bottom: .75rem;

&.jumbotron-title {
margin-left: -.25rem;
margin-right: -.25rem;
margin-bottom: .75rem;
margin-left: -.75rem;
margin-right: -.75rem;
background: $accent;
padding: 1.5rem .75rem;

Expand All @@ -24,8 +24,8 @@

&.profile {
padding: 1.5rem .75rem;
margin-left: -.25rem;
margin-right: -.25rem;
margin-left: -.75rem;
margin-right: -.75rem;

h4 {
color: #fff;
Expand Down
3 changes: 1 addition & 2 deletions themes/Typography/css/_thread.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.thread {
.thread-item {
padding: .5rem;
transition: .3s;

&:hover {
box-shadow: 0 0 9px rgba(0,0,0,.05), 0 1px 4px rgba(0,0,0,.1);
background: #fafafa;
}

Expand Down
113 changes: 21 additions & 92 deletions themes/Typography/css/_title.scss
Original file line number Diff line number Diff line change
@@ -1,108 +1,37 @@
.title-block {
padding: 1.5rem .75rem .25rem;
margin-bottom: .1rem;

&.title-block-primary {
color: #fff;
}

&.title-block-danger {
background-color: $red;
color: #fff;
}

&.title-block-success {
background-color: $green;
color: #fff;
}

&.title-block-forum {
margin-bottom: .1rem !important;
}

&.title-block-nav {
padding-bottom: 0;
border-radius: 0;
margin-bottom: 0;

.nav {
border: none;

.nav-item {
color: #fff;
border: none;
border-bottom: .25rem solid transparent;
padding: .7rem 0 .45rem;
margin: 0 .75rem;

&.active {
background-color: inherit;
border-bottom-color: #fff;
}
}

.nav-item {
border-radius: 0;
margin-bottom: 0;
}
.nav {
border: none;

.nav-item {
color: $accent;
border: none;
border-bottom: .25rem solid transparent;
padding: .7rem 0 .45rem;
margin: 0 .75rem;

&.active {
background-color: inherit;
border-bottom-color: $accent;
color: $accent;
}
}
}

.tab-set {
&:not(:last-child) {
margin-bottom: .75rem;
border-bottom: none !important;
&:hover {
border-bottom-color: $accent;
color: $accent;
}
}

&:last-child {
.nav-item {
border-radius: 0;
margin-bottom: 0;
}
}

.tab-set > .table-responsive > .table {
margin: 0;

&:last-child {
border-width: 0 1px 1px 1px;
border-style: solid;
}
}

.title-block {
&:not(:last-child) {
margin-bottom: 0;
}
}

.tab-content {
padding: .75rem;

&.tab-content-danger {
border-color: $red;
}

&.tab-content-success {
border-color: $green;
}

&:not(:first-child) {
border-top: none !important;
}

&:not(:last-child) {
border-bottom: none !important;
}

p:last-child {
margin-bottom: 0;
}
}

.tab-footer {
padding: .75rem;

&:last-child {
margin-bottom: .75rem;
}
margin-top: .75rem;
}
Loading

0 comments on commit 652805d

Please sign in to comment.