Skip to content

Commit

Permalink
Merge pull request #184 from adaptlearning/develop
Browse files Browse the repository at this point in the history
push develop to master
  • Loading branch information
moloko committed Oct 30, 2015
2 parents 26358f9 + f4e6609 commit a1c1da9
Show file tree
Hide file tree
Showing 17 changed files with 205 additions and 186 deletions.
4 changes: 4 additions & 0 deletions less/paddings.less
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
@page-padding-top: @page-header-padding;
@page-padding-bottom: @page-header-padding;

@page-title-margin-bottom: @title-text-margin;
@page-body-margin-bottom: @body-text-margin;
@page-instruction-margin-bottom: @instruction-text-margin;

// Buttons
@button-padding-top: @button-padding;
@button-padding-bottom: @button-padding;
Expand Down
31 changes: 24 additions & 7 deletions less/src/boxmenu.less
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
position:relative;
max-width: (@device-width-large / 2) - (@item-padding * 2);
margin: auto;
padding: @menu-block-padding-top @menu-block-padding-right (@menu-block-padding-bottom + 10px) @menu-block-padding-left;
padding: @menu-block-padding-top @menu-block-padding-right @menu-block-padding-bottom @menu-block-padding-left;
background-color: @menu-item-color;
color: @menu-item-text-color;
}
Expand All @@ -89,8 +89,16 @@
.page-level-progress-menu-item {
width: 60px;
height: 6px;
float: right;
float: none;
padding: 0;
position: absolute;
right: (@menu-block-padding-right+4);
bottom: (@menu-block-padding-bottom+6);

.dir-rtl & {
left: (@menu-block-padding-left+4);
right: auto;
}
}

.page-level-progress-menu-item-indicator {
Expand All @@ -108,14 +116,22 @@
}

.menu-item-duration {
margin-top: -10px;
position: absolute;
right: @menu-block-padding-right;
float: none;

.dir-rtl & {
float: none;
left: (@menu-block-padding-left);
right: auto;
}
}

.menu-item-button {
padding: 0;

a {
padding: @button-padding 40px;
button {
padding: @button-padding-top (@button-padding-right*2) @button-padding-bottom (@button-padding-left*2);
background-color:@button-color;
color:@button-text-color;

Expand All @@ -132,7 +148,7 @@
}
}

@media all and (max-width: 760px) {
@media all and (max-width: @device-width-medium) {

.menu{
.menu-inner {
Expand All @@ -150,7 +166,8 @@
.menu-item{
&.nth-child-even,
&.nth-child-odd {
.menu-item-inner{
.menu-item-inner,
.dir-rtl & .menu-item-inner {
margin: 0 auto;
}
}
Expand Down
28 changes: 21 additions & 7 deletions less/src/buttons.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,26 @@
.transition-all-colors;
.button-text;

.no-touch & {
&:hover {
background-color: @button-color-hover;
color: @button-text-color-hover;
border-color: @button-border-color-hover;
}
.no-touch &:hover {
background-color: @button-color-hover;
color: @button-text-color-hover;
border-color: @button-border-color-hover;
}

&.base {
// Override button styles on <a> tags coverted to <button> tags
// Could be improved so that buttons are divided into groups, default / submit / nav / icon
background-color: transparent;
padding: 0;
text-align: left;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;

.no-touch &:hover {
background-color: transparent;
}
}

.disabled-style() {
Expand All @@ -27,7 +41,7 @@
color: @button-text-color-disabled!important;
cursor:default;

&:hover {
.no-touch &:hover {
border-color: @button-border-color-disabled;
}
}
Expand Down
6 changes: 6 additions & 0 deletions less/src/drawer.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,16 @@
.sub-title;
}

.drawer-item-description {
font-size: @body-text-font-size;
line-height: @body-text-line-height;
}

.drawer-item-open {
border-bottom: 1px solid @drawer-item-color;
color: @drawer-item-text-color;
text-decoration: none;
width: 100%;

.no-touch &:hover {
background-color: @drawer-item-color-hover;
Expand Down
177 changes: 71 additions & 106 deletions less/src/hotgraphic.less
Original file line number Diff line number Diff line change
@@ -1,109 +1,74 @@
.hotgraphic-component {

.hotgraphic-item-body-inner {
.h5 {
.item-title;
margin-bottom: @title-text-margin;
}
}

.hotgraphic-graphic {
img {
width: 100%;
}
}

.hotgraphic-graphic-pin {
background-color: @item-text-color;

&.visited {
background-color: @item-text-color-visited;

.hotgraphic-graphic-pin-icon {
color: @item-color-visited;
}
}
}

.hotgraphic-graphic-pin-icon {
color: @item-color;
}

.hotgraphic-popup {
background-color: @item-body-color;
color: @item-body-text-color;
border: @item-border;
}

.hotgraphic-popup-toolbar {
padding: @item-padding-top @item-padding-right @item-padding-bottom @item-padding-left;
background-color: @item-color;
}

.hotgraphic-popup-nav {
background-color: @item-color;
}

.hotgraphic-popup-controls {
padding-top: 0;
padding-bottom: 0;
}

.hotgraphic-popup-done {
color: @item-text-color;
}

.hotgraphic-popup-arrow-l {
color: @item-text-color;
}

.hotgraphic-popup-arrow-r {
color: @item-text-color;
}

.hotgraphic-popup-close {
color: @item-text-color;
}

.hotgraphic-popup-count {
color: @item-text-color;
height: @icon-size;
line-height: @icon-size;
}

.hotgraphic-popup-inner {
padding: @item-padding-top @item-padding-right @item-padding-bottom @item-padding-left;
}

.hotgraphic-graphic-pin {
background-color: @item-text-color;

&.visited {
.hotgraphic-graphic-pin-icon {
color: @item-color-visited;
}
}
.no-touch &:hover {
background-color: @item-text-color;

.hotgraphic-graphic-pin-icon {
color: @item-color-hover;
}
}
}

.hotgraphic-graphic-pin-icon {
color: @item-color;
}

.hotgraphic-popup {
background-color: @background-color;
border: @item-border;
}

.hotgraphic-popup-toolbar {
background-color: @item-color;
}

.hotgraphic-popup-nav {
background-color: @item-color;
}

.hotgraphic-popup-done {
.no-touch &:hover {
.hotgraphic-popup-close {
color: @button-text-color-hover;
}
}
}

.hotgraphic-popup-arrow-l,
.hotgraphic-popup-arrow-r,
.hotgraphic-popup-close {
padding: @item-padding;
color: @button-text-color;
}

.hotgraphic-popup-count {
padding: @item-padding;
color: @item-text-color;
}

.hotgraphic-popup-controls {
.no-touch &:hover {
.hotgraphic-popup-arrow-l,
.hotgraphic-popup-arrow-r {
color: @button-text-color-hover;
}
}
}

.hotgraphic-popup-inner {
padding: @item-padding;
}

.hotgraphic-content-title {
.item-title;
margin-bottom: @title-text-margin;
}
}

.no-touch {
.hotgraphic-component {
.hotgraphic-graphic-pin {
&:hover {
background-color: @item-text-color-hover;
}
}
.hotgraphic-graphic-pin-icon {
&:hover {
color: @item-color-hover;
}
}
.hotgraphic-popup-close {
&:hover {
color: @item-text-color-hover;
}
}
.hotgraphic-popup-arrow-r {
&:hover {
color: @item-text-color-hover;
}
}
.hotgraphic-popup-arrow-l {
&:hover {
color: @item-text-color-hover;
}
}
}

}
4 changes: 1 addition & 3 deletions less/src/icons.less
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@
}

.icon {
color: @foreground-color;
color: @foreground-color;
display: block;
font-size: @icon-size;
height: @icon-size+1;
text-decoration: none;
width: @icon-size+1;
text-align: center;
}

Expand Down
Loading

0 comments on commit a1c1da9

Please sign in to comment.