commit 07137a11a87317f829b08a84ac75d88b36bf3755 Author: emma peel emma.peel@riseup.net Date: Wed Jun 12 16:01:42 2019 +0200
no hardcoded uppercase #30027 --- assets/scss/_tor.scss | 4 ++-- assets/scss/_type.scss | 2 +- assets/scss/utilities/_text.scss | 4 ++-- assets/static/bootstrap.css | 12 ++++++------ templates/components.html | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/assets/scss/_tor.scss b/assets/scss/_tor.scss index 4ea5311..ea45e2f 100755 --- a/assets/scss/_tor.scss +++ b/assets/scss/_tor.scss @@ -179,7 +179,7 @@ small, .small{ }
h6 { - text-transform: uppercase; + text-transform: none !important; font-weight: bold; color: $purple; } @@ -299,7 +299,7 @@ mark, .mark { // Badges // .badge{ - text-transform: uppercase; + text-transform: none !important; }
// diff --git a/assets/scss/_type.scss b/assets/scss/_type.scss index b1b8f61..4d3c698 100755 --- a/assets/scss/_type.scss +++ b/assets/scss/_type.scss @@ -105,7 +105,7 @@ mark, // Builds on `abbr` .initialism { font-size: 90%; - text-transform: uppercase; + text-transform: none !important; }
// Blockquotes diff --git a/assets/scss/utilities/_text.scss b/assets/scss/utilities/_text.scss index f4b6e65..a65d1b1 100755 --- a/assets/scss/utilities/_text.scss +++ b/assets/scss/utilities/_text.scss @@ -25,8 +25,8 @@ // Transformation
.text-lowercase { text-transform: lowercase !important; } -.text-uppercase { text-transform: uppercase !important; } -.text-capitalize { text-transform: capitalize !important; } +.text-uppercase { text-transform: none !important; } +.text-capitalize { text-transform: none !important; }
// Weight and italics
diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css index 21874b7..95e67d2 100644 --- a/assets/static/bootstrap.css +++ b/assets/static/bootstrap.css @@ -440,7 +440,7 @@ mark,
.initialism { font-size: 90%; - text-transform: uppercase; } + text-transform: none; }
.blockquote { margin-bottom: 1rem; @@ -6269,10 +6269,10 @@ a.bg-dark:focus, a.bg-dark:hover { text-transform: lowercase !important; }
.text-uppercase { - text-transform: uppercase !important; } + text-transform: none !important; }
.text-capitalize { - text-transform: capitalize !important; } + text-transform: none !important; }
.font-weight-light { font-weight: 300 !important; } @@ -6401,12 +6401,12 @@ a.text-dark:focus, a.text-dark:hover { font-family: Source Sans Pro Bold; }
h5 { - text-transform: uppercase; + text-transform: none; font-weight: bold; color: #7D4698; }
h6 { - text-transform: uppercase; + text-transform: none; font-weight: bold; color: #7D4698; }
@@ -6593,7 +6593,7 @@ mark, .mark { padding: 20px !important; }
.badge { - text-transform: uppercase; } + text-transform: none; }
.breadcrumb { background-color: #fff; } diff --git a/templates/components.html b/templates/components.html index cb5b6cc..1726f3a 100644 --- a/templates/components.html +++ b/templates/components.html @@ -54,13 +54,13 @@ </div> <div class="row p-5 bg-light"> <div class="col-12"> - <h2>Example heading <span class="badge badge-primary">New</span></h2> + <h2>Example heading <span class="badge badge-primary">NEW</span></h2> </div> <div class="col-12"> - <h4 class="pt-4">Example heading <span class="badge badge-secondary">New</span></h4> + <h4 class="pt-4">Example heading <span class="badge badge-secondary">NEW</span></h4> </div> <div class="col-12"> - <h6 class="pt-4">Example heading <span class="badge-pill badge-primary">New</span></h6> + <h6 class="pt-4">Example heading <span class="badge-pill badge-primary">NEW</span></h6> </div> </div>