Skip to content

Review and integrate open117 #162

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

Merged
merged 19 commits into from
Oct 9, 2015
Merged

Review and integrate open117 #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9811443
Merge branch 'master' into open117
charlesh88 Sep 23, 2015
9f7dc1d
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
825d93c
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
404d1e7
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
54a077a
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
09f5fa4
Merge branch 'open1515' of https://github.com/nasa/openmctweb into op…
charlesh88 Sep 24, 2015
9e64dfe
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
1d83516
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
67f627b
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 24, 2015
b3da6ed
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 25, 2015
a7153f3
[Frontend] Time controller-related styling (CP > open117)
charlesh88 Sep 25, 2015
7a67706
[Frontend] Time controller-related styling (CP > open117)
charlesh88 Sep 25, 2015
afb1202
[Frontend] Time controller-related styling (CP > open117)
charlesh88 Sep 25, 2015
e33485e
[Frontend] Time controller-related styling (CP > open117)
charlesh88 Sep 25, 2015
badaca5
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 26, 2015
23de391
[Frontend] Time Controller Markup and Styling
charlesh88 Sep 27, 2015
333f7cb
[Frontend] Time controller-related styling
charlesh88 Sep 29, 2015
5f7c8cc
Merge remote-tracking branch 'github/master' into open117b
VWoeltjen Oct 9, 2015
d902943
[Time Conductor] Satisfy JSLint
VWoeltjen Oct 9, 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] Time controller-related styling (CP > open117) 
open #1515
open #117
Fixing selects;
Minor tweak to normalize espresso/.../mixins.scss;
(cherry picked from commit 2866d56)
  • Loading branch information
@charlesh88
charlesh88 committed Sep 25, 2015
commit a7153f320f29d0ceb2813c844d23fb77f022cad3
1 change: 1 addition & 0 deletions platform/commonUI/general/res/sass/forms/_selects.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
padding: 0 $interiorMargin;
overflow: hidden;
position: relative;
line-height: $formInputH;
select {
@include appearance(none);
@include box-sizing(border-box);
Expand Down
4 changes: 2 additions & 2 deletions platform/commonUI/themes/espresso/res/sass/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
@include boxShdwSubtle();
}

@mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
@mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
@include containerSubtle($bg, $fg);
@include btnBase($bg, linear-gradient(lighten($bg, 15%), lighten($bg, 10%)), $fg, $ic);
@include text-shadow(rgba(black, 0.3) 0 1px 1px);
@include text-shadow($shdwItemText);
}

@function pullForward($c: $colorBodyBg, $p: 20%) {
Expand Down