Bug 1857401: Making theming more efficient with variables (0ae18ad9) · Commits · mahara / mahara

htdocs/theme/default/sass/components/_btn.scss

+3 −4

Original line number	Diff line number	Diff line
		// forum buttons
		.forum-post-btns {
		border-top: 1px dotted #ececec;
		border-top: 1px dotted $gray-100;
		padding: 10px;
		}

		.btn-secondary, .drag-default-button {
		.drag-default-button {
		background: $btn-secondary-bg;
		margin-bottom: 0;
		&:hover,
		&:focus {
		background: scale-color($btn-secondary-bg, $lightness: -9.7%);
		color: $theme-text-color;
		color: $btn-secondary-color;
		border-color: scale-color($btn-secondary-border, $lightness: -12%);
		}
		}

htdocs/theme/default/sass/components/_indicator.scss

deleted100755 → 0

+0 −51

Original line number	Diff line number	Diff line
		//dash
		.collapse-indicator {
		color: $link-color;
		.collapsed & {
		color: $link-color;
		}
		a:hover &,
		a:focus & {
		color: $link-hover-color;
		}
		}
		//dash inner
		//messages: inbox, sent
		//admin: site options
		//journals
		.inboxblock .link-block,
		.form-notificationlist h4 a,
		.pieform-fieldset.collapsible h4 a,
		.myblogs h5 a {
		&:hover .collapse-indicator,
		&:focus .collapse-indicator{
		color: $link-hover-color;
		}
		.collapse-indicator {
		color: $link-color;
		}
		}

		.expand-indicator {
		+ .icon {
		color: $link-color;
		&:hover, &:focus {
		color: $link-hover-color;
		}
		}
		}

		// syntax change if link is an outer-link
		[data-toggle="collapse"].outer-link {
		&.collapsed {
		~ .collapse-indicator {
		color: $link-color;
		}
		}
		&:hover,
		&:focus {
		~ .collapse-indicator {
		color: $link-hover-color;
		}
		}
		}

htdocs/theme/default/sass/components/_list-group.scss

+1 −10

Original line number	Diff line number	Diff line
		.list-group-item-link {
		a {
		&:hover {
		background-color: scale-color($theme-primary-color, $lightness: 90%);
		}
		}
		}

		.list-group-item-heading {
		font-family: $font-family-sans-serif;
		font-weight: 700;
		}

		.list-group-item {
		&.published {
		background-color: #fff;
		background-color: $white;
		}
		}

htdocs/theme/default/sass/features/_dashboard-widget.scss

+103 −174

Original line number	Diff line number	Diff line
		@@ -3,21 +3,31 @@ $logged-in-height-mobile: 125px;


		.dashboard-widget-container {
		@include clearfix;
		margin-top: $grid-gutter-width;
		text-align: center;

		.remove-widgets {
		font-size: $font-size-sm - 1;
		.thumbnail-widget {
		display: inline-block;
		vertical-align: top;
		margin-top: 0;
		margin-right: 20px;
		border-radius: 50%;
		text-align: center;
		width: $logged-in-height;
		padding: 0;
		float: none;

		@include media-breakpoint-down(md) {
		width: auto;
		display: block;
		margin-right: 0;
		}
		.hide-info{
		clear: both;

		&.last {
		margin-right: 0;
		}

		.widget-heading {
		@include clearfix;
		padding: 0;
		background-color: $dashboard-widget-bg;
		border-radius: 50%;
		height: $logged-in-height;
		width: $logged-in-height;
		@@ -29,41 +39,11 @@ $logged-in-height-mobile: 125px;
		display: inline-block;
		}

		h2 {
		margin: 5px 0 3px;
		text-align: center;
		color: #FFFFFF;
		font-weight: 700;

		@include media-breakpoint-down(md ) {
		font-size: 18px;
		margin-top: 0;
		}
		}

		p {
		margin: 0 16px;
		font-size: 13px;
		text-align: center;
		color: #FFFFFF;

		@include media-breakpoint-down(md ) {
		display: none;
		}
		}

		a {
		color: #FFFFFF;
		}
		}

		.circle-bg {
		text-align:center;
		padding-top: 10px;
		margin-right: 0 !important;
		margin-right: 0;
		float: none;
		background-color: transparent;
		border-radius: 0;
		width: auto;
		height: auto;

		@@ -72,20 +52,36 @@ $logged-in-height-mobile: 125px;
		}

		.icon {
		color: scale-color($theme-primary-color, $lightness: 60%);
		padding-top:16px;
		color: $dashboard-widget-cirlce-icon-color;
		font-size: 72px;

		@include media-breakpoint-down(md) {
		padding-top: 0;
		font-size: 60px;
		}
		}
		}

		&.icon-user {
		padding-left:0; // the only one that is actually centered by default
		h2 {
		text-align: center;

		@include media-breakpoint-down(md) {
		font-size: 18px;
		margin-top: 0;
		}
		}

		p {
		margin: 0 16px;
		font-size: 13px;
		text-align: center;

		@include media-breakpoint-down(md) {
		display: none;
		}
		}
		}


		.widget-detail {
		padding: 0 10px;
		@@ -101,8 +97,6 @@ $logged-in-height-mobile: 125px;

		p {
		margin-top: 10px;
		margin-bottom: 0;
		color: #333333;

		@include media-breakpoint-down(md) {
		font-size: 12px;
		@@ -112,37 +106,8 @@ $logged-in-height-mobile: 125px;
		}
		}

		.thumbnail-widget {
		display: inline-block;
		vertical-align: top;
		margin-top: 0;
		margin-bottom: 10px;
		border-radius: 50%;
		text-align: center;
		margin-right: 20px;
		width: $logged-in-height;
		padding: 0;
		float: none;

		@include media-breakpoint-down(md ) {
		width: auto;
		display: block;
		margin-right: 0;
		}

		&.last {
		margin-right: 0;
		}

		.widget {
		text-align: center;
		}
		}

		.logged-in {
		text-decoration: none;
		&.logged-in {
		height: $logged-in-height;
		overflow:hidden;

		@include media-breakpoint-down(md) {
		height: $logged-in-height-mobile;
		@@ -151,48 +116,25 @@ $logged-in-height-mobile: 125px;
		margin: 0 5px 10px 5px;
		}

		.widget-heading {
		h2 {
		margin: 5px 0 3px;
		text-align: center;
		color: #FFFFFF;
		font-weight: 700;

		@include media-breakpoint-down(md ) {
		font-size: 18px;
		margin-top: 0;
		}
		}
		p {
		color: #FFFFFF;
		margin: 0 16px;
		}
		}

		.widget-detail {
		@include transition(0.03s);
		opacity:0;
		margin-top: -$logged-in-height * 2;
		position: relative;
		vertical-align: middle;
		display: block;
		z-index: 2;
		background-color: #333333;
		background-color: $gray-700;
		height: $logged-in-height;
		width: $logged-in-height;
		border-radius: 50%;
		border: 0;

		@include media-breakpoint-down(md) {
		margin-top: -$logged-in-height-mobile * 2;
		height: $logged-in-height-mobile;
		width: $logged-in-height-mobile;
		padding: 0;
		border: 0;
		}

		p {
		margin-top: 0;
		color: #FFFFFF;
		display: table-cell;
		vertical-align: middle;
		height: $logged-in-height;
		@@ -200,43 +142,30 @@ $logged-in-height-mobile: 125px;
		@include media-breakpoint-down(md) {
		height: $logged-in-height-mobile;
		font-size: 11px;
		padding-top: 20px;
		padding-left: 10px;
		padding-right: 10px;
		display: block;
		}
		color: $dashboard-widget-title-color;
		}
		}
		}

		.logged-in:hover {
		&:hover {
		.widget-heading {
		@include media-breakpoint-down(md) {
		background: $dashboard-widget-bg;
		}
		}
		.widget-detail {
		@include transition(0.3s);
		opacity: 1;
		margin-top: -$logged-in-height;
		border: 0;

		@include media-breakpoint-down(md) {
		margin-top: -$logged-in-height-mobile;
		}
		p {
		margin-top: 0;
		color: #FFFFFF;
		display: table-cell;
		vertical-align: middle;
		height: $logged-in-height;

		@include media-breakpoint-down(md) {
		height: $logged-in-height-mobile;
		font-size: 11px;
		padding-left: 10px;
		padding-right: 10px;
		}
		}
		}

		}
		}

htdocs/theme/default/sass/layout/_header.scss

+4 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,7 @@
		background-image: url(../images/header-bkgd.png);
		}
		}

		.navbar-default {
		border-bottom: 0;
		}