Commit b67ca83f authored by Evonne's avatar Evonne Committed by Cecilia Vela Gurovic

Bug 1845104 Default theme bugs

- removing some redundant styles in default
- inbox message was too long for font to display in single line
- putting some styles back into raw instead
- search form in header wasn't fitting on single line on small device

behatnotneeded

Change-Id: Id556abbf0adecbae89378b91ee3164f89fe55285
parent aef1675e
......@@ -6,7 +6,7 @@
// Ensure background-color isn't visible when comments aren't enabled
.comment-container {
h3 {
padding: 36px 15px 0 15px;
padding: 30px 15px 0 15px;
}
hr {
margin: 0 15px;
......
.arrow-bar {
.arrow {
font-family: $font-family-sans-serif;
.text {
font-weight: 700;
color: #333333;
}
}
}
.nav-inpage {
&.nav > li {
> a, button {
......
......@@ -2,10 +2,6 @@
.forum-post-btns {
border-top: 1px dotted #ececec;
padding: 10px;
a {
color: $theme-primary-color;
}
}
.btn-secondary, .drag-default-button {
......
.list-group-item-link {
a {
color: $link-color;
&:hover {
color: $link-hover-color;
background-color: scale-color($theme-primary-color, $lightness: 90%);
}
}
......@@ -17,13 +15,4 @@
&.published {
background-color: #fff;
}
.list-group-item-controls,
.btn-action-list,
.list-group-item-heading {
&.btn-group-top {
@include media-breakpoint-up(lg) {
margin-top: -13px;
}
}
}
}
// Navigation toggle styles
.nav-toggle-area {
.user-icon {
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
}
}
.navbar-toggle {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
background-image: none;
border: 1px solid transparent;
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
&.collapsed {
background-color: transparent;
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
}
&.search-toggle {
@include media-breakpoint-up(md) {
display: none;
}
.icon {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
}
}
&.user-toggle {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
@include media-breakpoint-up(md) {
border-left-width: 1px;
}
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
}
&:last-of-type {
border-left-width: 1px;
}
}
// navbar menu children toggles
.nav {
.navbar-showchildren {
color: $navbar-inverse-toggle-color;
background: $navbar-inverse-toggle-bg;
border: 0;
&:hover,
&:focus {
background: $navbar-inverse-toggle-hover-bg;
.icon {
color: $navbar-inverse-toggle-hover-color;
}
}
.active & {
background-color: $navbar-inverse-toggle-active-bg;
.icon {
color: $navbar-inverse-toggle-active-color;
}
}
}
}
......@@ -240,9 +240,3 @@ $logged-in-height-mobile: 125px;
}
}
}
.dashboard-editable {
margin-top: $grid-gutter-width;
padding: ($grid-gutter-width - 10) 0;
border-top: 1px solid $btn-secondary-border;
}
.footer {
background-color: $site-footer-bg;
.footer-inner {
padding: 20px 10px;
.nav-link {
color: $site-footer-color;
font-weight: 700;
&:hover,
&:focus {
background-color: $site-footer-hover-bg;
color: $site-footer-hover-color;
}
}
.metadata {
color: $site-footer-color;
font-weight: 700;
}
}
&.upgrade-footer a {
font-weight: 700;
}
}
// admin footer
.admin {
.footer {
.footer-inner {
padding: 20px 10px;
background: none;
border: 0;
border-radius: 0;
}
}
}
......@@ -6,9 +6,4 @@
height: 5px;
background-image: url(../images/header-bkgd.png);
}
.admin-title {
font-weight: 300;
font-size: 16px;;
}
}
......@@ -17,8 +17,5 @@
background-color: $theme-secondary-color;
}
}
.card .list-group {
border: 0;
}
}
}
.card.collapsible {
&:not(.card-secondary).has-attachment {
.card-header a:not(.collapsed) {
border-bottom-width: 1px;
}
}
}
......@@ -13,11 +13,6 @@
}
}
.card-header .help a {
border: 0;
}
// sidebar card headings
.sidebar .card > .card-header {
@include border-top-radius(0);
......@@ -38,16 +33,6 @@
}
}
.card.collapsible {
.card-header-nested,
.card-header {
> a.outer-link {
border-color: #ddd;
}
}
}
.card-header:first-child {
@include border-top-radius(0);
}
......@@ -15,17 +15,5 @@
border-color: $card-secondary-border;
font-family: $font-family-sans-serif;
}
// removing left/right padding in card body
.block {
> .card-body {
padding: 15px 0;
}
}
}
.blockinstance-controls .btn-group-top {
@include media-breakpoint-down(lg) {
margin: 0;
}
}
}
......@@ -10,7 +10,11 @@
}
}
.card-quarter .card-header a {
font-family: $font-family-sans-serif;
font-weight: 300;
.card-collection,
.card-view {
.card-header {
.title-link {
font-family: $font-family-sans-serif;
}
}
}
.navbar-main {
.navbar-collapse {
border: 1px solid $navbar-default-link-border;
@include media-breakpoint-down(sm) {
border-width: 1px 0 0 0;
}
&.navbar-form {
border: 0;
}
}
// Top level navigation items use colour variables from "navbar-default"
.navbar-nav {
> li > a {
color: $navbar-default-link-color;
background-color: $navbar-default-link-bg;
border-top: 1px solid $navbar-default-link-border;
border-bottom: 1px solid $navbar-default-link-border;
&:hover,
&:focus {
background-color: $navbar-default-link-hover-bg;
color: $navbar-default-link-hover-color;
}
@include media-breakpoint-up(md) {
border: 1px solid $navbar-default-link-border;
}
}
> .active > a {
background-color: $navbar-default-active-bg;
color: $navbar-default-active-color;
&:hover,
&:focus {
background-color: $navbar-default-active-bg;
color: $navbar-default-active-color;
}
}
}
// Child navigation items
.child-nav {
li > a {
color: $navbar-inverse-link-color;
background-color: $navbar-inverse-bg;
&:hover,
&:focus {
background-color: $navbar-inverse-link-hover-bg;
color: $navbar-inverse-link-hover-color;
}
}
.active > a {
background-color: $navbar-inverse-link-active-bg;
color: $navbar-inverse-link-active-color;
&:hover,
&:focus {
background-color: $navbar-inverse-link-hover-bg;
color: $navbar-inverse-link-hover-color;
}
}
}
}
.nav-tabs {
border-bottom: 2px solid $theme-accent-color;
&.nav {
li > a {
font-weight: 400;
border: 0;
border-bottom: 1px solid $theme-accent-color;
color: $theme-text-color;
&:focus,
......@@ -15,16 +12,6 @@
color: $theme-text-color;
}
&.inactive {
color: $theme-text-lighttone-color;
&:hover,
&:focus {
color: $theme-text-lighttone-color;
background: transparent;
border-bottom-color: transparent;
}
}
&.active {
background-color: scale-color($theme-accent-color, $lightness: 60%);
color: $theme-text-color;
......
.table {
td {
h3 {
h3.title {
font-weight: 400;
font-family: $font-family-sans-serif;
}
}
}
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
font-family: $headings-font-family;
}
......@@ -29,8 +29,6 @@ $headings-color: #333333;
//
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
$border-radius-base: 0.1875rem;
//== Dropdowns
//
//## Dropdown menu container and contents.
......@@ -43,12 +41,16 @@ $dropdown-link-hover-color: scale-color($gray-700, $lightness: -5%);
//##
//== Tabs
$nav-tabs-border-color: #ddd;
$nav-tabs-link-hover-border-color: $gray-100;
$nav-tabs-border-color: $theme-accent-color;
$nav-tabs-border-width: 2px;
$nav-tabs-border-radius: $border-radius;
$nav-tabs-link-hover-border-color: $theme-accent-color;
$nav-tabs-link-active-color: $theme-text-color;
$nav-tabs-link-active-bg: scale-color($theme-accent-color, $lightness: 60%);
$nav-tabs-link-active-border-color: transparent transparent $theme-accent-color transparent;
//== Pills
$nav-pills-border-radius: $border-radius-base;
$nav-pills-border-radius: 0.1875rem;
//== Progress bars
//
......
@import "../typography/tables";
@import "../typography/typography";
// General customisation and component files go here...
@import "../layout/footer";
......@@ -9,13 +8,11 @@
// cards are a very commonly used layout component
@import "../layout/card/card";
@import "../layout/card/card-collapse"; // for collapsible cards and collapsible fieldsets
@import "../layout/card/card-header";
@import "../layout/card/card-secondary";
@import "../layout/card/card";
// Navigation
@import "../layout/nav/main-nav";
@import "../layout/nav/nav-tabs";
// Components - small reusable design elements
......@@ -23,7 +20,6 @@
@import "../components/btn";
@import "../components/indicator";
@import "../components/list-group";
@import "../components/toggles";
// Feature related sass. We avoid this where we can in favour of reusable components
@import "../features/dashboard-widget";
......
......@@ -22,7 +22,7 @@
<span class="icon icon-wrench text-default left" role="presentation" aria-hidden="true"></span>
{/if}
<span class="sr-only">{$i->strtype}</span>
{$i->subject|str_shorten_html:50:true|safe}
{$i->subject|str_shorten_html:45:true|safe}
<span class="icon icon-chevron-down collapse-indicator float-right text-small" role="presentation" aria-hidden="true"></span>
</a>
{/if}
......
......@@ -145,10 +145,11 @@
font-size: $font-size-sm;
display: block;
padding: 10px 15px;
color: $link-color;
&:hover {
background: #efefef;
text-decoration: none;
color: scale-color($link-color, $lightness: -16%);
color:$link-hover-color;
}
small {
color: $link-color;
......
......@@ -58,7 +58,6 @@
}
.icon {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
}
}
......
......@@ -35,9 +35,6 @@
clear: both;
padding-top: 10px;
}
.admin & {
padding: 10px;
}
}
&.upgrade-footer {
.mahara-logo {
......
......@@ -6,6 +6,7 @@
position: relative;
display: block;
font-family: $font-family-sans-serif;
font-weight: 300;
p {
margin: 0;
}
......@@ -64,6 +65,7 @@
}
.help a { //fix css on contextual help icons
padding: 0;
border: 0;
&:hover {
background:none;
}
......
......@@ -15,6 +15,7 @@
font-family: $font-family-serif;
border-bottom: 2px solid $card-secondary-border;
font-size: $h4-font-size;
font-weight: 300;
margin-top: 0;
}
&.blockinstance.card {
......
......@@ -45,12 +45,14 @@
.header-search-form {
input[type=text] {
width: calc(100% - 43px);
width: calc(100% - 75px);
float: left;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
margin-left: 15px;
@include media-breakpoint-up(md) {
width: auto;
margin-left: 0;
}
}
.input-group-append {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment