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 #4 from knoonevipasolutions/master
Browse files Browse the repository at this point in the history
Styles for additional demo form
  • Loading branch information
knoonevipasolutions committed Dec 16, 2015
2 parents 4e96a8e + 405f070 commit e1d08df
Show file tree
Hide file tree
Showing 22 changed files with 707 additions and 518 deletions.
13 changes: 13 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions .idea/deployment.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/jsLibraryMappings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions .idea/misc.xml

This file was deleted.

1 change: 0 additions & 1 deletion .idea/watcherTasks.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions font-glyphs/src/icons/uF107-delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions font-glyphs/src/icons/uF108-upload.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 modified web/design/fonts/glyph-lib/glyph-font.eot
Binary file not shown.
6 changes: 6 additions & 0 deletions web/design/fonts/glyph-lib/glyph-font.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 modified web/design/fonts/glyph-lib/glyph-font.ttf
Binary file not shown.
Binary file modified web/design/fonts/glyph-lib/glyph-font.woff
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
jQuery(function($) {

var $filemetricSelect = $('.filemetric-interactions input[type=file]');

$filemetricSelect.removeAttr('accept');

});
68 changes: 1 addition & 67 deletions web/stylesheets/src/components/partials/_tables.scss
Original file line number Diff line number Diff line change
@@ -1,71 +1,5 @@
.miwt-table {
width: 100%;
box-shadow: 0 0 2px lighten($color-grey-55, 25%);

th,
td {
padding: 10px 15px;
}

thead {
td,
th {
background-color: $app--table-headings-bg-color;
color: $app--table-headings-text-color;
text-align: left;
}

th {
&.control {
width: 1px;
white-space: nowrap;

.column-label {
display: inline-block;

+ .column-visibility {
margin-left: 5px;
}
}

input[type=checkbox] {
display: block;
}

.column-visibility {
input[type=checkbox] {
display: inline-block;
}
}
}
}

a {
color: $app--table-headings-text-color;
}
}

tr {
td {
background-color: $app--table-row-odd-bg-color;
}

&:nth-child(even) {
td {
background-color: $app--table-row-even-bg-color;
}
}
}

button,
.btn {
@include style-button-override($font-size: 12px);
white-space: nowrap;
}

.btn + .btn {
margin-left: $app--btn-spacing-between-btns;
}
@include style-standard-table;

div.column-visibility {
.trigger {
Expand Down
4 changes: 3 additions & 1 deletion web/stylesheets/src/config/_font-glyph-entities.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
$html-entity-delete: "\f107";
$html-entity-warning: "\f101";
$html-entity-error: "\f102";
$html-entity-success: "\f103";
$html-entity-help: "\f104";
$html-entity-info: "\f105";
$html-entity-trash: "\f106";
$html-entity-trash: "\f106";
$html-entity-upload: "\f108";
71 changes: 71 additions & 0 deletions web/stylesheets/src/mixins/_mixins-style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,75 @@
@mixin style-message-important {
@include style-message-base;
@include style-message-important-override;
}

@mixin style-standard-table {
width: 100%;
box-shadow: 0 0 2px lighten($color-grey-55, 25%);

th,
td {
padding: 10px 15px;
}

thead {
td,
th {
background-color: $app--table-headings-bg-color;
color: $app--table-headings-text-color;
text-align: left;
}

th {
&.control {
width: 1px;
white-space: nowrap;

.column-label {
display: inline-block;

+ .column-visibility {
margin-left: 5px;
}
}

input[type=checkbox] {
display: block;
}

.column-visibility {
input[type=checkbox] {
display: inline-block;
}
}
}
}

a {
color: $app--table-headings-text-color;
}
}

tr {
td {
background-color: $app--table-row-odd-bg-color;
}

&:nth-child(even) {
td {
background-color: $app--table-row-even-bg-color;
}
}
}

button,
.btn {
@include style-button-override($font-size: 12px);
white-space: nowrap;
}

.btn + .btn {
margin-left: $app--btn-spacing-between-btns;
}

}
16 changes: 7 additions & 9 deletions web/stylesheets/src/pages/_definitions/_page--dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,14 @@
background-color: $color-grey-f2;
border-top: 1px solid $color-white;

span.report {
.btn {
display: block;
width: 100%;

+ span.report {
+ .btn {
margin-top: $app--btn-spacing-between-btns;
}
}

.btn {
display: block;
width: 100%;
}
}

@include breakpoint($bp-mobile-landscape) {
Expand Down Expand Up @@ -78,9 +74,11 @@
padding-bottom: 15px;
text-align: right;

span.report {
.btn {
display: inline-block;
+ span.report {
width: auto;

+ .btn {
margin-top: 0;
margin-left: $app--btn-spacing-between-btns;
}
Expand Down
Loading

0 comments on commit e1d08df

Please sign in to comment.