Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Commit

Permalink
Merge pull request #11 from knoonevipasolutions/master
Browse files Browse the repository at this point in the history
Merge styles for v2.1.0
  • Loading branch information
knoonevipasolutions committed Feb 29, 2016
2 parents 9427821 + 583fee8 commit da30bea
Show file tree
Hide file tree
Showing 20 changed files with 286 additions and 52 deletions.
11 changes: 11 additions & 0 deletions font-glyphs/src/icons/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions font-glyphs/src/icons/graph.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/src/design/shared/VipaMetricsLoginMed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions web/src/stylesheets/config/_default-vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ $font--web-root-path: "/_fonts" !default;

//reused theme variables
$color--theme-accent: #4b93ad !default;
$color--theme-accent-alternate: #1f4557 !default;

//landing template
$landing--bg-image: url(/_resources/dyn/files/21273z6d51a6f4/_fn/VipaMetricsLoginDrk.png) !default;
$landing--bg-image: url(/_resources/dyn/files/2828332z4d6c28e4/_fn/VipaMetricsLoginMed.png) !default;
$landing--bg-color: $color--theme-accent !default;

//app variables
Expand All @@ -17,9 +18,9 @@ $app--base-font-family: $font-open-sans !default;

$app--body-bg-color: $color-grey-e7 !default;
$app--body-text-color: $color-grey-33 !default;
$app--header-bg-color: $color-grey-33 !default;
$app--header-bg-color: $color-white !default;
$app--footer-bg-color: $color-grey-e7 !default;
$app--footer-text-color: $color-white !default;
$app--footer-text-color: $color-grey-33 !default;
$app--footer-height: 50px !default;

$app--nav-link-color: $color--theme-accent !default;
Expand Down
8 changes: 6 additions & 2 deletions web/src/stylesheets/config/themes/_standard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

//VipaMetric Dark
$color--theme-accent: #4b93ad;
$color--theme-accent-alternate: #1f4557;

$landing--bg-color: $color-grey-33;
$app--table-headings-bg-color: $color-grey-33;
$landing--bg-color: $color-white;
$app--table-headings-bg-color: $color--theme-accent-alternate;
$app--nav-link-color: $color--theme-accent-alternate;
$app--nav-link-hover-color: $color--theme-accent;
$app--nav-link-underline-color: $color--theme-accent-alternate;

@import "../_default-vars";
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
position: relative;
padding-bottom: 20px;
min-height: 25px;
min-width: 70px;

img {
width: 100%;
Expand Down
2 changes: 2 additions & 0 deletions web/src/stylesheets/pages/_definitions/_page--dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "_page--dashboard/price-matrix";

.vipametric,
.dash-section,
.dash_message {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.price-matrix {
.miwt-table {
tr {
th, td {
&:first-child {
width: 30%;
}
}
}
}
}
14 changes: 10 additions & 4 deletions web/src/stylesheets/pages/_definitions/_page--engagement-edit.scss
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,9 @@ span.metric-bucket.value-component {
// END STYLES FOR NEW HTML

// STYLES FOR VM-440, MEDIA SUMMARY WIDGET
.primary-content.vipametric-wrapper {
.primary-content.vipametric-wrapper,
.survey-summary-container,
.leads-summary-container {
@include breakpoint($bp-tablets-landscape) {
margin-right: 240px;
}
Expand All @@ -687,7 +689,6 @@ span.metric-bucket.value-component {
}

// END STYLES FOR VM-440

.default-group {
.numeric-metric {
display: block;
Expand Down Expand Up @@ -829,8 +830,13 @@ span.metric-bucket.value-component {
}
}



// In-Market Survey only
.consumer-link-outer-con {
button.btn.trigger {
width: auto;
height: auto;
}
}

// User Management
.user-management {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,59 @@
.section.leads {
.section-content {
.section.leads,
.leads-summary-container {
@include style-contentbox;
padding: 0;

.section-content,
.leads-summary-content {
padding: 15px 25px;
}

.leads-summary-header {
@include style-h3;
color: $color-grey-33;
border-bottom: 1px solid $color-grey-e2;
padding: 10px 25px;
background-color: $color-grey-f2;

a {
@include style-button-base;
display: block;
width: 100%;
color: $color-grey-33;
text-align: center;
}
}

@include breakpoint($bp-mobile-landscape) {
padding:0;
}
}

.lead {
display: inline-block;
width: 25%;
vertical-align: top;
border-right: 1px solid $color-grey-e7;
padding-left: 20px;

&:first-child {
padding-left: 0;
.lead,
.leads-summary {
+ .leads-summary {
margin-top: 20px;
}

&:nth-child(4n) {
border-right: 0 none;
@include breakpoint($bp-tablets-portrait) {
display: inline-block;
width: 25%;
vertical-align: top;
border-right: 1px solid $color-grey-e7;
padding-left: 20px;

+ .leads-summary {
margin-top: 0;
}

&:first-child {
padding-left: 0;
}

&:nth-child(4n) {
border-right: 0 none;
}
}
}

Expand Down Expand Up @@ -60,6 +97,53 @@
}
}

.leads-summary-heading {
font-size: 16px;
font-family: $font-open-sans-semi-bold;
color: $color--theme-accent;
}

.leads-summary-heading:after {
@include glyphAdd($html-entity-link);
vertical-align: baseline;
padding-left: 5px;
text-decoration: none;
}

.submissions-data-count {
font-size: 32px;
margin-right: 5px;
display: inline-block;
vertical-align: middle;
}

.submissions-data-text {
display: inline-block;
vertical-align: middle;
margin-right: 10px;
}

.leads-summary-actions {
.btn {
vertical-align: middle;
display: inline-block;

&-download {
&:before {
margin-right: 0;
}

font-size: 0;
padding: 5px;
}

+ .btn {
margin-left: 3px;
}
}
}


.lead-count {
font-size: 32px;
display: inline-block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,55 +1,113 @@
.section.surveys {
.survey-item {
margin: 5px 0;
display: inline-block;
vertical-align: top;
width: 25%;
padding-left: 20px;
border-right: 1px solid $color-grey-e7;
.section.surveys,
.survey-summary-container {
@include style-contentbox;
margin-top: 0;
padding: 0;

.section-content,
.survey-summary-content {
padding: 15px 25px;
}

&:first-child {
padding-left: 0;
.survey-summary-header {
@include style-h3;
color: $color-grey-33;
border-bottom: 1px solid $color-grey-e2;
padding: 10px 25px;
background-color: $color-grey-f2;

a {
@include style-button-base;
display: block;
width: 100%;
color: $color-grey-33;
text-align: center;
}
}

&:nth-child(4n) {
border-right: 0 none;
.survey-item,
.survey-summary {
+ .survey-summary {
margin-top: 20px;
}
}

.survey-item-name {
.survey-item-name,
.survey-link {
font-size: 16px;
font-family: $font-open-sans-semi-bold;
color: $color--theme-accent;
}

a.survey-item-name:after {
a.survey-item-name:after,
.survey-link a:after {
@include glyphAdd($html-entity-link);
vertical-align: baseline;
padding-left: 5px;
text-decoration: none;
}

.survey-item-data-count {
.survey-item-data-count,
.submissions-data-count {
font-size: 32px;
margin-right: 5px;
display: inline-block;
vertical-align: middle;
}

.survey-item-data-text {
.survey-item-data-text,
.submissions-data-text {
display: inline-block;
vertical-align: middle;
margin-right: 10px;
}

.survey-item-actions {
.survey-item-actions,
.summary-actions {
.btn {
vertical-align: middle;
display: inline-block;

&-download {
&:before {
margin-right: 0;
}

font-size: 0;
padding: 5px;
}

+ .btn {
margin-left: 3px;
}
}
}

@include breakpoint($bp-mobile-landscape) {
padding: 0;
margin-top: 0;
}

@include breakpoint($bp-tablets-portrait) {
.survey-summary {
margin: 5px 0;
display: inline-block;
vertical-align: top;
width: 25%;
padding-left: 20px;
border-right: 1px solid $color-grey-e7;

+ .survey-summary {
margin-top: 0;
}

&:first-child {
padding-left: 0;
}

&:nth-child(4n) {
border-right: 0 none;
}
}
}
}
Loading

0 comments on commit da30bea

Please sign in to comment.