Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge branch 'master' into divehi_font
  • Loading branch information
naveed-ahmad authored Nov 28, 2017
commit bfaed7648047b0df3f0ef30b75e136e302d14c91
2 changes: 0 additions & 2 deletions src/styles/fonts/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@
url('//quran-1f14.kxcdn.com/fonts/divehi/divehi.ttf') format('truetype'),
url('//quran-1f14.kxcdn.com/fonts/divehi/divehi.svg#dhivehiregular')
format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
Expand Down
81 changes: 7 additions & 74 deletions src/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';

$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import 'components/MasterHeader';
@import 'components/SmartBanner';
@import 'fonts/fonts';
Expand All @@ -8,22 +7,17 @@ $icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';
@import 'partials/tooltip';
@import 'nightmode';
@import 'partials/surah_names';

@import 'partials/_tooltip';
html,
body {
height: 100%;
min-height: 100%;
font-size: 14px;

@media (max-width: $screen-sm-max) {
font-size: 12px;
}
}

.min-container {
min-height: 80vh;
}

.highlight {
background-color: #f5fbf7;
}
Expand All @@ -39,21 +33,6 @@ a:focus {
-webkit-box-shadow: none;
}

.opening {
background-color: rgba(#c4beb0, 0.25);
}

.font-sizes {
background-color: $brand-primary;
border-radius: 6px;
li {
&:hover {
cursor: pointer;
background-color: darken($brand-primary, 5%);
}
}
}

.popover {
max-width: 600px;
width: auto;
Expand All @@ -63,6 +42,7 @@ a:focus {
li em {
word-break: break-all;
}

.loading {
img {
width: 100px;
Expand All @@ -74,61 +54,18 @@ li em {
font-weight: 300;
}
}

.form-success-message {
padding: 5% 0;
}

.about-text {
padding-top: 5%;
padding-bottom: 5%;
h3 {
font-size: 130%;
}
.row {
padding-top: 1%;
padding-bottom: 1%;
h3 {
color: $light-green;
@extend .montserrat;
}
h4 {
font-weight: 300;
line-height: 150%;
}
}
.credits {
h3 {
color: $text-color;
}
h4 {
@extend .source-sans;
}
}
}

.pointer {
cursor: pointer;
}

.vertical-align-middle {
vertical-align: middle;
}
.no-outline {
outline: none !important;

&:hover,
&:focus {
outline: none !important;
}
}
.text-color {
color: $text-color;
}
.text-black {
color: #333;
}
.text-black-light {
color: #777;
}

.ss-icon.text-align {
vertical-align: middle;
Expand All @@ -139,7 +76,6 @@ li em {
.btn-link {
color: inherit;
}

.btn-link:hover,
.btn-link:focus {
text-decoration: none;
Expand All @@ -165,12 +101,10 @@ li em {
direction: rtl;
font-family: 'Nafees';
text-align: right;

#arabic {
font-family: monospace;
}
}

.divehi {
font-family: 'divehi';
}
Expand All @@ -185,6 +119,7 @@ li em {
width: 100%;
}
}

.persian {
text-align: right;
direction: rtl;
Expand Down Expand Up @@ -217,14 +152,12 @@ li em {
.navbar-nav .open .dropdown-menu .dropdown-header {
padding: 5px 15px;
}

.pager .next,
.pager .previous {
display: block;
margin: 10px 0;

& > a {
float: none;
}
}
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.