diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
| commit | e2a03b5d20253d7a1eb10b8c110d9feec79e995f (patch) | |
| tree | cc36cbb2572e549ce59388654d358cb1e2771ecd /app/assets/stylesheets | |
| parent | 595a48a91f8549b20109942e0b80df4f891d5999 (diff) | |
| parent | 21d0843117c0962bd962fc50fccaf276a5b3067f (diff) | |
Fixed a merging conflict.
Merge branch 'switchboard' into develop
Conflicts:
app/models/sip_account.rb
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/switchboard_entries.css.scss | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 44868e4..557bbda 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -16,4 +16,5 @@ *= require softkeys *= require phone_numbers *= require route_elements + *= require switchboard_entries */ diff --git a/app/assets/stylesheets/switchboard_entries.css.scss b/app/assets/stylesheets/switchboard_entries.css.scss new file mode 100644 index 0000000..12b67ee --- /dev/null +++ b/app/assets/stylesheets/switchboard_entries.css.scss @@ -0,0 +1,5 @@ +#switchboard_entries .handle { + font-size: 12px; + color: #777; + cursor: move; +}
\ No newline at end of file |