summaryrefslogtreecommitdiffstats
path: root/apps/theming
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-162-0/+60
|
* Merge pull request #6128 from nextcloud/primary-font-color-in-capabilitiesMorris Jobke2017-08-152-9/+22
|\ | | | | Add the primary font color to the capabilities as well
| * Add the primary font color to the capabilities as wellJoas Schilling2017-08-152-9/+22
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Add buttom border for headerMorris Jobke2017-08-141-0/+20
|/ | | | | | | * allows to distinct the header from the rest of the UI for bright colors * ref #5654 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the full URL to the "server.css" file that has to be reloaded (if any) is now got from the DataResponse provided by the controller. Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| | | | | | | This is a preparatory step for a following change in which reloadStylesheets will have to be able to receive absolute URLs. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist. The "server.css" URL must be known by the Theming app in order to update the stylesheets when previewing the changes to the theme, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). The "server.css" URL provided by the response will be taken into account by the JavaScript front-end in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| | | | | | | | This is a preparatory step for a following commit in which the properties present in the response will change depending on whether the request was successful or not. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-08-092-2/+2
|
* Merge pull request #5982 from ↵Lukas Reschke2017-08-081-1/+2
|\ | | | | | | | | nextcloud/fix-loading-icon-inside-upload-button-in-theming-app Fix loading icon inside upload button in Theming app
| * Fix loading icon inside upload button in Theming appDaniel Calviño Sánchez2017-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Pull request #5969 fixed the vertical alignment of loading icon and status message in Theming app, but in doing so it broke the loading icon inside the upload button. When an image is being uploaded the upload icon is replaced by a loading icon, so the loading icon and the upload icon have to share their CSS rules, but only in that specific case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #5972 from ↵Morris Jobke2017-08-081-1/+1
|\ \ | |/ |/| | | | | nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button Replace loading icon GIF with pure CSS in login button
| * Replace loading icon GIF with pure CSS loading iconDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pure CSS loading icon uses an ::after pseudo-element, and thus it can only be used on container elements; the input element is not a container element, so when the class "icon-loading-small" is set on an input element it falls back to a loading icon GIF. This commit modifies the markup of the login button to add a div element that holds the confirm icon and the loading icon (depending on the case). In order to position the icon in the same place as before the input and the icon are both wrapped by another div making possible to set the absolute position of the icon relative to the input. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #5969 from ↵Morris Jobke2017-08-041-20/+8
|\ \ | | | | | | | | | | | | nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app Fix vertical alignment of loading icon and status message in Theming app
| * | Fix code styleDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove superfluous selector partDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Align vertically loading icon and status messageDaniel Calviño Sánchez2017-08-031-6/+6
| | | | | | | | | | | | | | | | | | | | | As both elements are inline/inline-block and belong to the same line they can be aligned vertically using "vertical-align: middle". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Do not use the same rules for loading icon than for upload iconDaniel Calviño Sánchez2017-08-031-2/+1
| | | | | | | | | | | | | | | | | | | | | The loading icon is used in a totally different way than the upload icon and thus it should not share its CSS rules. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove ignored rulesDaniel Calviño Sánchez2017-08-031-11/+0
| |/ | | | | | | | | | | | | The removed rules were either always overriden by other rules or never used due to not matching any element. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #5967 from nextcloud/revert-5682-inline-svg-iconMorris Jobke2017-08-041-2/+2
|\ \ | | | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
| * | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-031-2/+2
| |/
* / [tx-robot] updated from transifexNextcloud bot2017-08-042-0/+48
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-032-0/+2
|
* Merge pull request #5953 from nextcloud/theming-lightness-correctionLukas Reschke2017-08-021-4/+7
|\ | | | | Use same lightness calculation as the SCSS compiler for theming
| * Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-011-4/+7
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Proof of concept #5593 - inline SVG icon for icon-contactsMarin Treselj2017-08-021-2/+2
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | [tx-robot] updated from transifexNextcloud bot2017-08-026-0/+122
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-302-2/+14
|
* [tx-robot] updated from transifexNextcloud bot2017-07-292-0/+48
|
* [tx-robot] updated from transifexNextcloud bot2017-07-252-0/+8
|
* [tx-robot] updated from transifexNextcloud bot2017-07-242-0/+58
|
* [tx-robot] updated from transifexNextcloud bot2017-07-232-0/+58
|
* Add Android and iOS URLs to theming appMorris Jobke2017-07-192-0/+71
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Allow overwriting of IOS theming valuesRoeland Jago Douma2017-07-191-1/+20
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2017-07-152-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2017-07-142-2/+10
|
* Merge pull request #5070 from nextcloud/theming-vs-themesJoas Schilling2017-07-133-28/+67
|\ | | | | Prefer custom theme over the theming app
| * Prefer custom theme over theming appJulius Härtl2017-07-123-28/+67
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2017-07-132-2/+2
| |
* | Merge pull request #5567 from nextcloud/public-capabilitiesRoeland Jago Douma2017-07-121-2/+2
|\ \ | | | | | | Public capabilities API
| * | Expose theming capabilities to publicJulius Härtl2017-06-301-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-122-4/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-07-082-0/+2
| |/ |/|
* | Merge pull request #5407 from nextcloud/5157-simple-logoMorris Jobke2017-07-042-4/+3
|\ \ | | | | | | Simplified Nextcloud logo icon #2
| * | Revert background-size as requested, issue will be fixed separatelyMarin Treselj2017-07-021-0/+3
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
| * | Simplified Nextcloud logo iconMarin Treselj2017-07-022-7/+3
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-032-0/+8
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-07-012-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2017-06-242-0/+2
|