Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review and integrate open95b into master #118

Merged
merged 30 commits into from
Sep 23, 2015
Merged

Review and integrate open95b into master #118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
933927c
[Common UI] Reduce digest count
VWoeltjen Jun 29, 2015
2cbe686
[Frontend] IN-PROGRESS Refactoring to cleanup SASS file structure
charlesh88 Aug 31, 2015
bb1a02c
[Frontend] Significant re-factoring of CSS and markup
charlesh88 Sep 3, 2015
4997fc1
Merge branch 'mobile' of https://github.com/nasa/openmctweb into open95
charlesh88 Sep 3, 2015
62898c9
Merge branch 'open95' of https://github.com/nasa/openmctweb into open95
charlesh88 Sep 3, 2015
37c34c6
[Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to …
charlesh88 Sep 3, 2015
ac41ed7
[Frontend] IN-PROGRESS Theme changes continuing
charlesh88 Sep 4, 2015
86deec6
[Frontend] IN-PROGRESS Theme changes continuing
charlesh88 Sep 5, 2015
4db48af
[Frontend] IN-PROGRESS Theme changes continuing
charlesh88 Sep 9, 2015
32b895b
[Frontend] IN-PROGRESS Theme changes continuing
charlesh88 Sep 9, 2015
3792dab
[Frontend] IN-PROGRESS Theme changes continuing
charlesh88 Sep 10, 2015
3b2454c
[Frontend] IN-PROGRESS Theming continues
charlesh88 Sep 10, 2015
d14c4e0
[Frontend] IN-PROGRESS Theming continues
charlesh88 Sep 10, 2015
a840b59
[Frontend] IN-PROGRESS Theming continues, sanding
charlesh88 Sep 10, 2015
3e5d46a
[Frontend] IN-PROGRESS Theme changes continuing
charlesh88 Sep 11, 2015
72c122e
Merge remote-tracking branch 'github/master' into open95b
VWoeltjen Sep 15, 2015
a3a6706
[Browse] Separate out back-arrow behavior
VWoeltjen Sep 15, 2015
4f5a111
[Frontend] Themes final on open prior to VISTA integration
charlesh88 Sep 16, 2015
acdd35c
[Forms] Fix select control
VWoeltjen Sep 16, 2015
f28d2f1
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
charlesh88 Sep 16, 2015
9fdb9f0
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
charlesh88 Sep 16, 2015
9a7f435
[Frontend] Minor color tweaks in Snow theme
charlesh88 Sep 17, 2015
c9b2f58
[Frontend] Minor tweaks to sizing of controls
charlesh88 Sep 21, 2015
54334a8
[Frontend] Setting default theme for open back to espresso
charlesh88 Sep 21, 2015
8611926
Merge remote-tracking branch 'github-open/open113' into open-master
Sep 22, 2015
2040304
Merge remote-tracking branch 'github-open/open19' into open-master
Sep 22, 2015
aba0969
Merge branch 'mobile-integration' into open-master
Sep 22, 2015
dbe1875
[Themes] Resolve conflicts
VWoeltjen Sep 22, 2015
fb0861f
[Config] Fixed image URLs in ImageTelemetry.js;
charlesh88 Sep 23, 2015
056b0c8
[Fixed Position] Use spaces instead of tabs
VWoeltjen Sep 23, 2015
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
[Frontend] IN-PROGRESS Theming continues, sanding 
open #95
Fixed grid icon hover color;
Various color normalization;
  • Loading branch information
@charlesh88
charlesh88 committed Sep 10, 2015
commit a840b59044b328f04cd7924c98e3f7e00bb710cf
4 changes: 2 additions & 2 deletions platform/commonUI/general/res/sass/_about.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
line-height: 120%;

a {
color: #84b3ff;
color: $colorAboutLink;
}
.s-description,
.s-info {
Expand Down Expand Up @@ -89,7 +89,7 @@
border-top: none;
}
em {
color: darken($colorBodyFg, 20%);
color: pushBack($colorBodyFg, 20%);
// margin-left: 2em;
&:first-child {
// margin-left: 0;
Expand Down
14 changes: 1 addition & 13 deletions platform/commonUI/general/res/sass/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ body, html {
}

em {
// color: rgba(white, 0.2); Removed this as a global setting
font-style: normal;
}

Expand Down Expand Up @@ -114,7 +113,7 @@ mct-container {

.codehilite {
@extend .code;
background-color: rgba(#fff, 0.1);
background-color: rgba($colorBodyFg, 0.1);
padding: 1em;
}

Expand All @@ -130,10 +129,6 @@ mct-container {
margin: 0;
}

.colorKey {
color: $colorKey;
}

.ds {
@include box-shadow(rgba(#000, 0.7) 0 4px 10px 2px);
}
Expand All @@ -143,13 +138,6 @@ mct-container {
display: none !important;
}

.paused {
&:not(.s-btn) {
border-color: $colorPausedBg !important;
color: $colorPausedBg !important;
}
}

.sep {
color: rgba(#fff, 0.2);
}
1 change: 1 addition & 0 deletions platform/commonUI/general/res/sass/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@

@mixin btnBase($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
@include user-select(none);
@include transition(background, .25s);
.icon {
color: $ic;
}
Expand Down
2 changes: 1 addition & 1 deletion platform/commonUI/general/res/sass/_text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}

h1, h2, h3 {
color: #fff;
color: pullForward($colorBodyFg, 20%);
font-weight: normal !important;
margin-bottom: 1em;
}
Expand Down
53 changes: 6 additions & 47 deletions platform/commonUI/general/res/sass/controls/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,42 +22,6 @@
$baseRatio: 1.5;
$pad: $interiorMargin * $baseRatio;

/******* LAYOUT AND SIZING */
/*.l-btn {
@include user-select(none);
//line-height: 1.5em; // Was 1.25em
line-height: 150%;
padding: 0 $pad;
text-decoration: none;
&.lg,
&.create-btn {
$h: $ueTopBarH; // - $interiorMargin;
height: $h;
line-height: $h - 2;
padding: 0 $pad * 3;
}
&.create-btn {
font-size: 1em;
&:before {
content:"+";
font-family: symbolsfont;
}
.menu {
margin-left: $pad * -1;
}
>.ui-symbol {
//font-size: 1.1em; // Normalizing for new icomoon symbols font
}
}
&.sm {
padding: 0 $pad / $baseRatio;
}
&.vsm {
padding: 0 ($pad / $baseRatio) / 2;
}
}*/

/*********************************** STYLE STYLES */
.s-btn {
@include box-sizing(border-box);
@include user-select(none);
Expand Down Expand Up @@ -156,15 +120,10 @@ $pad: $interiorMargin * $baseRatio;
}
}

/*********************************** LAYOUT STYLES */
/*

span.s-btn,
span.s-btn span,
a.s-btn,
a.s-btn span,
a.s-btn,
a.s-btn span {
display: inline-block;
.paused {
&:not(.s-btn) {
border-color: $colorPausedBg !important;
color: $colorPausedBg !important;
}
}
*/

4 changes: 2 additions & 2 deletions platform/commonUI/general/res/sass/items/_item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
$iconMargin: 40px;
$iconD: ($d - ($iconMargin * 2)) * 0.85;
$transTime: 200ms;
@include btnSubtle($colorItemBg, pullForward($colorItemBg, 20%), $colorItemFg, $colorItemIcon);
@include btnSubtle($colorItemBg, pullForward($colorItemBg, 20%), $colorItemFg, $colorItemIc);
box-sizing: border-box;
cursor: pointer;
float: left;
Expand Down Expand Up @@ -90,7 +90,7 @@
//@include trans-prop-nice("color", $transTime);
@include absPosDefault($iconMargin, false);
//@include test(red);
color: $colorItemIcon;
//color: $colorItemIc;
text-align: center;
font-size: $iconD * 0.95; //6em;
line-height: $iconD;
Expand Down
2 changes: 1 addition & 1 deletion platform/commonUI/general/res/sass/search/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
.clear-icon,
.menu-icon {
cursor: pointer;
transition: color .25s;
@include transition(color, .25s);
}


Expand Down
Loading