diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2013-12-19 04:32:34 -0800 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2013-12-19 04:32:34 -0800 |
| commit | 43f86e58d2976d4c56f1921b272380b66758ae67 (patch) | |
| tree | 7ec302037c8f436635387ce145b0436bfb29dd32 /css | |
| parent | 98d3328c5ea97b91faa184206799f4e7e7ccfd57 (diff) | |
| parent | fd6137741f6331da70432e063a576a63f5588466 (diff) | |
Merge pull request #411 from sub/issue242
Make feed title editable (FIX #242)
Diffstat (limited to 'css')
| -rw-r--r-- | css/feeds.css | 45 | ||||
| -rw-r--r-- | css/owncloud6.css | 13 |
2 files changed, 55 insertions, 3 deletions
diff --git a/css/feeds.css b/css/feeds.css index b31a7c9aa..0516575fc 100644 --- a/css/feeds.css +++ b/css/feeds.css @@ -122,8 +122,8 @@ border: 0; box-shadow: none; display: none; - height: 32px; - width: 32px; + height: 30px; + width: 22px; } #app-navigation li:hover > .utils button { @@ -182,14 +182,55 @@ button.action:hover { padding-left: 0; } +#app-navigation .rename-feed > input { + width: 155px; + height: 15px; +} + .delete-icon { background-image: url('%webroot%/core/img/actions/delete.svg'); } +.rename-feed-icon { + background-image: url('%webroot%/core/img/actions/rename.svg'); +} + .mark-read-icon { background-image: url('%appswebroot%/news/img/mark_read.svg'); } +.rename-feed input { + margin: 1px 0 0px 5px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-right: 0; +} + +.rename-feed button { + margin: 5px 0 5px 0; + display: inline-block; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + width: 30px !important; + height: 30px !important; + padding: 0.6em; +} + +.rename-feed .action-button { + background-position: center; + background-repeat: no-repeat; +} + +.rename-feed .back-button { + border-radius: 3px; + background-image: url('%webroot%/core/img/actions/delete.svg'); +} + +.rename-feed .create-button { + border-radius: 0; + background-image: url('%appswebroot%/news/img/mark_read.svg'); +} + .rss-icon { background-image: url('%appswebroot%/news/img/rss.svg'); } diff --git a/css/owncloud6.css b/css/owncloud6.css index d59dab6a8..bde3bc7af 100644 --- a/css/owncloud6.css +++ b/css/owncloud6.css @@ -8,14 +8,25 @@ width: 299px; } +#app-navigation .rename-feed > input { + width: 215px; + height: 32px; +} + #app-navigation .progress-icon, #app-navigation .problem-icon { width: 299px; line-height: 44px; } +#app-navigation .rename-feed-icon { + padding-right: 10px; + padding-left: 5px; +} + #app-navigation .mark-read-icon { - padding-right: 40px; + padding-right: 20px; + padding-left: 5px; } #app-navigation li:hover > a { |