diff options
| author | Sander <sbrand@exed.nl> | 2016-09-21 13:03:39 +0300 |
|---|---|---|
| committer | Sander <sbrand@exed.nl> | 2016-09-21 13:03:39 +0300 |
| commit | c99e03d950d057109166c45a7a2dbf1a3b84d265 (patch) | |
| tree | 0a503fea8ec70a4e829dc0f309f8d39f5b7c40ab /sass | |
| parent | c8d230b747b24a52a5d6fc8c6754e6301708677c (diff) | |
| parent | f87ef993740f73f9cdc90256cfa86eb3995625d2 (diff) | |
Merge sharing into master, resolve merge conflict
Diffstat (limited to 'sass')
| -rw-r--r-- | sass/app.scss | 1 | ||||
| -rw-r--r-- | sass/share_credential.scss | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sass/app.scss b/sass/app.scss index b85bdbbd..12af5678 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -8,6 +8,7 @@ @import 'vaults'; @import 'credentials'; @import 'menu'; +@import 'share_credential'; #app-settings-content:not(.ng-hide) { height: 60px; diff --git a/sass/share_credential.scss b/sass/share_credential.scss new file mode 100644 index 00000000..ea2ea1ee --- /dev/null +++ b/sass/share_credential.scss @@ -0,0 +1,3 @@ +.table{ + width: 100%; +}
\ No newline at end of file |