5999b212d1
Refactor reloadStylesheets to receive absolute URLs
...
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>
2017-08-10 12:37:57 +02:00
db52e861dd
Provide "server.css" URL in ThemingController response
...
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>
2017-08-10 12:37:57 +02:00
986dffdae4
Split updateStylesheet tests for success and error
...
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>
2017-08-10 12:37:57 +02:00
d7e45d45c4
Unify DataResponse format with its uses in the rest of the file
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
9707ef9ba7
Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app
...
Fix loading icon inside upload button in Theming app
2017-08-08 18:41:57 +02:00
d7645ee928
Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button
...
Replace loading icon GIF with pure CSS in login button
2017-08-08 14:40:35 +02:00
2398e845c9
Fix loading icon inside upload button in Theming app
...
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>
2017-08-07 15:04:43 +02:00
de94eefe97
Merge pull request #5969 from 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
2017-08-04 12:08:16 +02:00
d63beffe9e
Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon
...
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-04 10:53:21 +02:00
1f8a45bbd7
[tx-robot] updated from transifex
2017-08-04 00:08:18 +00:00
b237379fa1
Replace loading icon GIF with pure CSS loading icon
...
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>
2017-08-03 21:09:43 +02:00
09a8c4a5d4
Fix code style
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
c723d093a8
Remove superfluous selector part
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
4fbcbd3e6d
Align vertically loading icon and status message
...
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>
2017-08-03 21:09:25 +02:00
fa7f4e5cae
Do not use the same rules for loading icon than for upload icon
...
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>
2017-08-03 21:09:25 +02:00
33c4a674a2
Remove ignored rules
...
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>
2017-08-03 21:09:25 +02:00
9abbd6ab13
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-03 17:27:24 +02:00
21dd85678f
[tx-robot] updated from transifex
2017-08-03 00:08:06 +00:00
ea2e629c6c
Merge pull request #5953 from nextcloud/theming-lightness-correction
...
Use same lightness calculation as the SCSS compiler for theming
2017-08-02 23:17:19 +02:00
ffcdc96a0b
Proof of concept #5593 - inline SVG icon for icon-contacts
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
2800e017de
[tx-robot] updated from transifex
2017-08-02 00:08:10 +00:00
9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-01 18:09:07 +01:00
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
e48ca730fe
Add Android and iOS URLs to theming app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:20:47 +02:00
e2298e0a71
Allow overwriting of IOS theming values
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 08:22:45 +02:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
e335121d5e
Merge pull request #5070 from nextcloud/theming-vs-themes
...
Prefer custom theme over the theming app
2017-07-13 13:41:31 +02:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
86a496d94a
Merge pull request #5567 from nextcloud/public-capabilities
...
Public capabilities API
2017-07-12 13:04:54 +02:00
ce5ad7e7f4
Prefer custom theme over theming app
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-12 11:42:15 +02:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
f59062ce83
[tx-robot] updated from transifex
2017-07-08 00:08:27 +00:00
f3c25e177f
Merge pull request #5407 from nextcloud/5157-simple-logo
...
Simplified Nextcloud logo icon #2
2017-07-04 12:56:05 +02:00
c94dbddd12
[tx-robot] updated from transifex
2017-07-03 00:08:21 +00:00
02dd7f5965
Revert background-size as requested, issue will be fixed separately
...
Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
2017-07-02 14:15:09 +02:00
3470d0a44e
Simplified Nextcloud logo icon
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-02 14:14:49 +02:00
d49276082e
[tx-robot] updated from transifex
2017-07-01 00:08:28 +00:00
42d9be4529
Expose theming capabilities to public
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-30 11:08:54 +02:00
4526b8d6a3
[tx-robot] updated from transifex
2017-06-24 00:08:29 +00:00
146c699eb4
[tx-robot] updated from transifex
2017-06-21 00:08:15 +00:00
adf2f88873
Fix more icon in apps menu on bright backgrounds
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-17 10:14:21 +02:00
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
74654288e6
[tx-robot] updated from transifex
2017-06-16 00:08:44 +00:00
ea64cb0028
[tx-robot] updated from transifex
2017-06-13 00:08:22 +00:00
67069facb7
Show reset to default button for theming values on hover, fix #3198
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-09 15:54:17 +02:00
628284a34c
[tx-robot] updated from transifex
2017-06-09 00:08:24 +00:00
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
5f9cc5a2d5
[tx-robot] updated from transifex
2017-05-31 00:08:48 +00:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
c1925ddfd0
[tx-robot] updated from transifex
2017-05-26 00:08:16 +00:00
a46d2f1d39
[tx-robot] updated from transifex
2017-05-25 00:08:04 +00:00
6cc26efbc5
[tx-robot] updated from transifex
2017-05-24 00:08:22 +00:00
9c8a838624
[tx-robot] updated from transifex
2017-05-23 00:08:29 +00:00
1efd961476
Merge pull request #5010 from nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app
...
Fix starting lower case letter in tooltip of Theming app
2017-05-22 15:03:18 +02:00
bc8fbc1a67
Bump app versions as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
fdfe8f7f15
Adjust version requirement
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
8a05494964
Fix starting lower case letter in tooltip of Theming app
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-20 17:10:26 +02:00
c1c676f602
Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream
...
Fix logo being too big on log in page, fix #4585
2017-05-19 20:50:09 +02:00
52f10c436e
Scale logo only for custom ones
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 16:18:09 +02:00
e24105feba
[tx-robot] updated from transifex
2017-05-19 00:08:26 +00:00
c605472950
Merge pull request #4888 from nextcloud/theming-fallback-icons
...
Fallback to default favicon
2017-05-18 23:30:02 +02:00
489131333a
Inject FileAccessHelper for proper testing
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-18 10:45:42 +02:00
d41fd7471c
[tx-robot] updated from transifex
2017-05-18 00:07:48 +00:00
2ec616323b
Merge pull request #4918 from nextcloud/theming-capabilities-plain-background
...
OCS Return color when theming uses no background image
2017-05-17 10:42:41 -05:00
81847c01b0
Return color when theming uses no background image
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 13:16:44 +02:00
639168ede4
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:16:59 +02:00
d3865b6096
Use appdata logo when generating icons
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:14:37 +02:00
edb5502b9d
Add proper Content-Type to icons
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
1157f413c9
Fallback to default favicon
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
70c750dacc
Fix logo being too big on log in page, fix #4585
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 15:53:54 +02:00
b1bd9ff0b9
[tx-robot] updated from transifex
2017-05-14 00:07:54 +00:00
37d333c3b5
Don't open the dialog for logo and background
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:48:51 +02:00
c2350f237e
Clicking on theming preview triggers fileupload dialog
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:49:36 -05:00
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
fb204de7f6
Fix theming preview for background image
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-09 18:21:41 +02:00
37b847ec48
[tx-robot] updated from transifex
2017-05-09 05:08:07 +00:00
f6a4028fad
[tx-robot] updated from transifex
2017-05-09 00:07:51 +00:00
9d8e9b1efb
[tx-robot] updated from transifex
2017-05-08 20:49:06 +00:00
099234cf12
Add function to request SVG or regular fallback image
...
Fixes https://github.com/nextcloud/server/issues/4647
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
2801f5139b
Adjust login button color and remove border
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
510f7cf1b6
Fix tests for theming backgroundColor
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
4199a56912
Theming app: Add plain background color option
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-05-08 10:16:29 +02:00
6109afc14d
[tx-robot] updated from transifex
2017-05-08 00:07:37 +00:00
56bb8745df
[tx-robot] updated from transifex
2017-05-07 00:07:31 +00:00
59ee22101f
[tx-robot] updated from transifex
2017-05-06 00:07:33 +00:00
ac04fb8277
Fix invalid theming URLs
...
* logo and background image had the cache buster applied twice:
background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0 );
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-05 00:37:32 -03:00
619d09529c
[tx-robot] updated from transifex
2017-05-05 00:07:28 +00:00
806aeae71d
[tx-robot] updated from transifex
2017-05-04 00:07:29 +00:00
3dbf30c220
[tx-robot] updated from transifex
2017-05-03 00:07:31 +00:00
f27d382c47
[tx-robot] updated from transifex
2017-05-02 00:07:20 +00:00
dba55f950a
Merge pull request #4594 from nextcloud/theming-image-default
...
Delete theming images when logo/background is reset to default
2017-05-01 12:55:00 -03:00
2152d5f1f6
[tx-robot] updated from transifex
2017-05-01 00:07:32 +00:00
7c69c117e2
Delete theming images when logo/background is reset to default
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-30 11:04:55 -03:00
4518f6dc64
[tx-robot] updated from transifex
2017-04-30 00:07:21 +00:00
6e215a0874
Code cleanup and preview for undo actions
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
6b8341ce4b
Use generated SCSS for theming preview
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
c4673224d1
[tx-robot] updated from transifex
2017-04-29 00:07:17 +00:00
ed21ab56c7
Merge pull request #4584 from nextcloud/hint-theming
...
Hint: Theming customizes the look and feel of supported clients too
2017-04-28 19:11:34 -03:00
d13e311aaf
Invert new header icons on bright theming colors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-28 15:53:33 -03:00
2eeed15f19
Hint: Theming customizes the look and feel of supported clients too
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-04-28 20:34:58 +02:00
6908818999
[tx-robot] updated from transifex
2017-04-28 00:07:41 +00:00
5e1ce69b05
adding some documentation hints and some smaller cleanup
2017-04-25 17:45:35 +02:00
6448cf5748
Mock it
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 12:16:07 +02:00
bedd500884
Logo and background URLs must be relative
...
They are used way to often for such a change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:43:06 +02:00
bc1efdf2e1
Fix theming tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
68a63ad3f3
Implement scss variable injection by OC_Defaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Add Scss variables to example theme and theming app
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Use SCSSCacher to build theming css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Update theming.scss
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Code cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Inject SCSSCacher for easier testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix typehint
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Generate absolute URLs
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Fix tests to always use absolute urls for theming images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
MailheaderColor -> ColorPrimary
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
133f3fdc9a
[tx-robot] updated from transifex
2017-04-25 00:07:30 +00:00
8c703c954d
Fix theming tests
...
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
df2235c71f
[tx-robot] updated from transifex
2017-04-17 00:07:33 +00:00
69e0e2420c
[tx-robot] updated from transifex
2017-04-16 00:07:23 +00:00
dafa9c740a
[tx-robot] updated from transifex
2017-04-15 00:07:36 +00:00
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
d83c8e0271
ThemingDefaults append cacheBusterCounter to logo URL by default
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:09 -05:00
5b4adf66e5
Move OC_Defaults to OCP\Defaults
...
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
281ad406e8
Add support for theming
...
Add support for theming in generated emails and simplify API
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
9098042c95
[tx-robot] updated from transifex
2017-04-01 00:08:09 +00:00
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
4ea79a5bbe
[tx-robot] updated from transifex
2017-03-25 01:07:45 +00:00
cae8702ab2
[tx-robot] updated from transifex
2017-03-22 01:07:53 +00:00
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
b3556456b6
Don't use private api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 11:32:29 +01:00
e8750f618b
Correctly escape the footer description from theming
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:11:41 +01:00
4da6b7e796
[tx-robot] updated from transifex
2017-03-15 01:07:49 +00:00
0dd0242d2f
[tx-robot] updated from transifex
2017-03-13 01:08:19 +00:00
37fcc41004
[tx-robot] updated from transifex
2017-03-12 01:08:05 +00:00
8904fb1cf3
[tx-robot] updated from transifex
2017-03-10 01:08:01 +00:00
e6dcbb39ac
[tx-robot] updated from transifex
2017-03-07 01:07:40 +00:00
15673bc601
[tx-robot] updated from transifex
2017-03-06 01:07:58 +00:00
1d5e94a4f2
[tx-robot] updated from transifex
2017-03-05 01:07:46 +00:00
badb45fce4
[tx-robot] updated from transifex
2017-03-04 01:07:41 +00:00
b55ce43ba5
[tx-robot] updated from transifex
2017-03-03 01:07:45 +00:00
9b95ecb6a1
Transifex config for theming app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-01 22:05:25 -06:00
e5ddb40a3e
Add test for creating AppData folder
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-20 15:48:22 +01:00
3f0134622d
Use createMock
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:39 +01:00
Daniel Calviño Sánchez
Nextcloud bot
Lukas Reschke
Morris Jobke
Joas Schilling
Marin Treselj
Julius Härtl
Roeland Jago Douma
Roeland Jago Douma
Marin Treselj
Jan-Christoph Borchardt
Marius Blüm
Frank Karlitschek
