diff --git a/services/web/.gitignore b/services/web/.gitignore index 708048810b..f0c799e2dc 100644 --- a/services/web/.gitignore +++ b/services/web/.gitignore @@ -65,9 +65,9 @@ public/js/services/ public/js/utils/ public/stylesheets/style*.css -public/stylesheets/ol-style*.css -public/stylesheets/ol-light-style*.css -public/stylesheets/ol-ieee-style*.css +public/stylesheets/sl-style*.css +public/stylesheets/light-style*.css +public/stylesheets/ieee-style*.css public/stylesheets/*.map public/minjs/ diff --git a/services/web/Makefile b/services/web/Makefile index dbeb2f3a0c..d2389d60db 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -26,14 +26,14 @@ LESS_FILES := $(shell find public/stylesheets -name '*.less') LESSC_COMMON_FLAGS := --source-map --autoprefix="last 2 versions, ie >= 10" CLEANCSS_FLAGS := --s0 --source-map -LESS_SL_FILE := public/stylesheets/style.less -CSS_SL_FILE := public/stylesheets/style.css -LESS_OL_FILE := public/stylesheets/ol-style.less -CSS_OL_FILE := public/stylesheets/ol-style.css -LESS_OL_LIGHT_FILE := public/stylesheets/ol-light-style.less -CSS_OL_LIGHT_FILE := public/stylesheets/ol-light-style.css -LESS_OL_IEEE_FILE := public/stylesheets/ol-ieee-style.less -CSS_OL_IEEE_FILE := public/stylesheets/ol-ieee-style.css +LESS_SL_FILE := public/stylesheets/sl-style.less +CSS_SL_FILE := public/stylesheets/sl-style.css +LESS_OL_FILE := public/stylesheets/style.less +CSS_OL_FILE := public/stylesheets/style.css +LESS_OL_LIGHT_FILE := public/stylesheets/light-style.less +CSS_OL_LIGHT_FILE := public/stylesheets/light-style.css +LESS_OL_IEEE_FILE := public/stylesheets/ieee-style.less +CSS_OL_IEEE_FILE := public/stylesheets/ieee-style.css CSS_FILES := $(CSS_SL_FILE) $(CSS_OL_FILE) $(CSS_OL_LIGHT_FILE) $(CSS_OL_IEEE_FILE) diff --git a/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee b/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee index 192f572beb..2b522d6c6c 100644 --- a/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee +++ b/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee @@ -3,32 +3,32 @@ settings = require "settings-sharelatex" module.exports = _.template """ -
+
<% if (title) { %> -

+

<%= title %>

<% } %> -
 
+
 
<% if (greeting) { %> -

+

<%= greeting %>

<% } %> -

+

<%= message %>

-
 
+
 
-
- +
+ <%= ctaText %>
<% if (secondaryMessage) { %> -
 
-

+
 
+

<%= secondaryMessage %>

<% } %> @@ -38,7 +38,7 @@ module.exports = _.template """ <%= ctaURL %>

-
+
<% if (gmailGoToAction) { %> <% } %> -""" +""" \ No newline at end of file diff --git a/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee b/services/web/app/coffee/Features/Email/Bodies/sl-SingleCTAEmailBody.coffee similarity index 69% rename from services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee rename to services/web/app/coffee/Features/Email/Bodies/sl-SingleCTAEmailBody.coffee index 2b522d6c6c..192f572beb 100644 --- a/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee +++ b/services/web/app/coffee/Features/Email/Bodies/sl-SingleCTAEmailBody.coffee @@ -3,32 +3,32 @@ settings = require "settings-sharelatex" module.exports = _.template """ -
+
<% if (title) { %> -

+

<%= title %>

<% } %> -
 
+
 
<% if (greeting) { %> -

+

<%= greeting %>

<% } %> -

+

<%= message %>

-
 
+
 
-
- +
+ <%= ctaText %>
<% if (secondaryMessage) { %> -
 
-

+
 
+

<%= secondaryMessage %>

<% } %> @@ -38,7 +38,7 @@ module.exports = _.template """ <%= ctaURL %>

-
+
<% if (gmailGoToAction) { %> <% } %> -""" \ No newline at end of file +""" diff --git a/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee b/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee index d141f64ff7..280eb2da16 100644 --- a/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee +++ b/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee @@ -5,13 +5,16 @@ module.exports = _.template """ - + - - + - +
-
+
- -
-
+ +
+
-
+
-

- SHARELATEX +

-
+

+ Overleaf

-
 
-
-
 
+
 
+
+
 
<%= body %> -
-
 
-

- #{ settings.appName} • #{ settings.siteUrl } +
+
 
+

+ #{ settings.appName} • #{ settings.siteUrl }

diff --git a/services/web/app/coffee/Features/Email/Layouts/ol-BaseWithHeaderEmailLayout.coffee b/services/web/app/coffee/Features/Email/Layouts/sl-BaseWithHeaderEmailLayout.coffee similarity index 80% rename from services/web/app/coffee/Features/Email/Layouts/ol-BaseWithHeaderEmailLayout.coffee rename to services/web/app/coffee/Features/Email/Layouts/sl-BaseWithHeaderEmailLayout.coffee index 280eb2da16..d141f64ff7 100644 --- a/services/web/app/coffee/Features/Email/Layouts/ol-BaseWithHeaderEmailLayout.coffee +++ b/services/web/app/coffee/Features/Email/Layouts/sl-BaseWithHeaderEmailLayout.coffee @@ -5,16 +5,13 @@ module.exports = _.template """ - + - - + - +
-
+
- -
-
+ +
+
-
+
-

- Overleaf +

-
+

+ SHARELATEX

-
 
-
-
 
+
 
+
+
 
<%= body %> -
-
 
-

- #{ settings.appName} • #{ settings.siteUrl } +
+
 
+

+ #{ settings.appName} • #{ settings.siteUrl }

diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index bb320f6039..76b9b9316a 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -342,21 +342,21 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)-> next() webRouter.use (req, res, next) -> - isOl = (Settings.brandPrefix == 'ol-') + isSl = (Settings.brandPrefix == 'sl-') res.locals.uiConfig = - defaultResizerSizeOpen : if isOl then 7 else 24 - defaultResizerSizeClosed : if isOl then 7 else 24 - eastResizerCursor : if isOl then "ew-resize" else null - westResizerCursor : if isOl then "ew-resize" else null - chatResizerSizeOpen : if isOl then 7 else 12 + defaultResizerSizeOpen : if isSl then 24 else 7 + defaultResizerSizeClosed : if isSl then 24 else 7 + eastResizerCursor : if isSl then null else "ew-resize" + westResizerCursor : if isSl then null else "ew-resize" + chatResizerSizeOpen : if isSl then 12 else 7 chatResizerSizeClosed : 0 - chatMessageBorderSaturation: if isOl then "85%" else "70%" - chatMessageBorderLightness : if isOl then "40%" else "70%" - chatMessageBgSaturation : if isOl then "85%" else "60%" - chatMessageBgLightness : if isOl then "40%" else "97%" - defaultFontFamily : if isOl then 'lucida' else 'monaco' - defaultLineHeight : if isOl then 'normal' else 'compact' - renderAnnouncements : !isOl + chatMessageBorderSaturation: if isSl then "70%" else "85%" + chatMessageBorderLightness : if isSl then "70%" else "40%" + chatMessageBgSaturation : if isSl then "60%" else "85%" + chatMessageBgLightness : if isSl then "97%" else "40%" + defaultFontFamily : if isSl then 'monaco' else 'lucida' + defaultLineHeight : if isSl then 'compact' else 'normal' + renderAnnouncements : isSl next() webRouter.use (req, res, next) -> diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 34bccf4bf8..07a14c1a4e 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -398,7 +398,7 @@ module.exports = settings = appName: "ShareLaTeX (Community Edition)" adminEmail: "placeholder@example.com" - brandPrefix: "" # Set to 'ol-' for overleaf styles + brandPrefix: "sl-" nav: title: "ShareLaTeX Community Edition" diff --git a/services/web/public/apple-touch-icon-precomposed.png b/services/web/public/apple-touch-icon-precomposed.png index b974874ec9..f0eb3aba59 100644 Binary files a/services/web/public/apple-touch-icon-precomposed.png and b/services/web/public/apple-touch-icon-precomposed.png differ diff --git a/services/web/public/favicon.ico b/services/web/public/favicon.ico index dcbc26c05d..6a14f7a5b9 100644 Binary files a/services/web/public/favicon.ico and b/services/web/public/favicon.ico differ diff --git a/services/web/public/mask-favicon.svg b/services/web/public/mask-favicon.svg index c5a06b93d1..2fbecbb5ae 100644 --- a/services/web/public/mask-favicon.svg +++ b/services/web/public/mask-favicon.svg @@ -1,4 +1,4 @@ favicon - + diff --git a/services/web/public/ol-apple-touch-icon-precomposed.png b/services/web/public/ol-apple-touch-icon-precomposed.png deleted file mode 100644 index f0eb3aba59..0000000000 Binary files a/services/web/public/ol-apple-touch-icon-precomposed.png and /dev/null differ diff --git a/services/web/public/ol-favicon.ico b/services/web/public/ol-favicon.ico deleted file mode 100644 index 6a14f7a5b9..0000000000 Binary files a/services/web/public/ol-favicon.ico and /dev/null differ diff --git a/services/web/public/ol-mask-favicon.svg b/services/web/public/ol-mask-favicon.svg deleted file mode 100644 index 2fbecbb5ae..0000000000 --- a/services/web/public/ol-mask-favicon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - favicon - - diff --git a/services/web/public/ol-touch-icon-192x192.png b/services/web/public/ol-touch-icon-192x192.png deleted file mode 100644 index 76cd6acc3e..0000000000 Binary files a/services/web/public/ol-touch-icon-192x192.png and /dev/null differ diff --git a/services/web/public/sl-apple-touch-icon-precomposed.png b/services/web/public/sl-apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..b974874ec9 Binary files /dev/null and b/services/web/public/sl-apple-touch-icon-precomposed.png differ diff --git a/services/web/public/sl-favicon.ico b/services/web/public/sl-favicon.ico new file mode 100644 index 0000000000..dcbc26c05d Binary files /dev/null and b/services/web/public/sl-favicon.ico differ diff --git a/services/web/public/sl-mask-favicon.svg b/services/web/public/sl-mask-favicon.svg new file mode 100644 index 0000000000..c5a06b93d1 --- /dev/null +++ b/services/web/public/sl-mask-favicon.svg @@ -0,0 +1,4 @@ + + favicon + + diff --git a/services/web/public/sl-touch-icon-192x192.png b/services/web/public/sl-touch-icon-192x192.png new file mode 100644 index 0000000000..df869be62c Binary files /dev/null and b/services/web/public/sl-touch-icon-192x192.png differ diff --git a/services/web/public/stylesheets/ol-ieee-style.less b/services/web/public/stylesheets/ieee-style.less similarity index 97% rename from services/web/public/stylesheets/ol-ieee-style.less rename to services/web/public/stylesheets/ieee-style.less index daa0f85f42..05036e3f49 100644 --- a/services/web/public/stylesheets/ol-ieee-style.less +++ b/services/web/public/stylesheets/ieee-style.less @@ -1,4 +1,4 @@ -@import 'ol-style.less'; +@import 'style.less'; @import 'core/ol-ieee-variables.less'; @is-overleaf : true; diff --git a/services/web/public/stylesheets/ol-light-style.less b/services/web/public/stylesheets/light-style.less similarity index 82% rename from services/web/public/stylesheets/ol-light-style.less rename to services/web/public/stylesheets/light-style.less index 1b7bee169f..85bfec3bc1 100644 --- a/services/web/public/stylesheets/ol-light-style.less +++ b/services/web/public/stylesheets/light-style.less @@ -1,4 +1,4 @@ -@import "ol-style.less"; +@import "style.less"; @import "core/ol-light-variables.less"; @is-overleaf : true; diff --git a/services/web/public/stylesheets/ol-style.less b/services/web/public/stylesheets/ol-style.less deleted file mode 100644 index 6518e1c314..0000000000 --- a/services/web/public/stylesheets/ol-style.less +++ /dev/null @@ -1,26 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:300,400,700&subset=latin-ext); -@import url(https://fonts.googleapis.com/css?family=Merriweather:400,400i,700,700i); - -@is-overleaf : true; -@is-overleaf-light : false; -@show-rich-text : true; - -// Core variables and mixins -@import "core/ol-variables.less"; -@import "app/ol-style-guide.less"; -@import "_style_includes.less"; -@import "_ol_style_includes.less"; -@import "components/embed-responsive.less"; -@import "components/icons.less"; -@import "components/images.less"; -@import "components/navs-ol.less"; -@import "components/pagination.less"; -@import "components/tabs.less"; - -// Pages -@import "app/about.less"; -@import "app/blog-posts.less"; -@import "app/cms-page.less"; -@import "app/content_page.less"; -@import "app/plans-ol.less"; -@import "app/portals.less"; \ No newline at end of file diff --git a/services/web/public/stylesheets/sl-style.less b/services/web/public/stylesheets/sl-style.less new file mode 100755 index 0000000000..a088397598 --- /dev/null +++ b/services/web/public/stylesheets/sl-style.less @@ -0,0 +1,11 @@ +@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700); +@import url(https://fonts.googleapis.com/css?family=Merriweather:400,400i,700,700i); + + +@is-overleaf : false; +@is-overleaf-light : false; +@show-rich-text : false; + +// Core variables and mixins +@import "core/variables.less"; +@import "_style_includes.less"; \ No newline at end of file diff --git a/services/web/public/stylesheets/style.less b/services/web/public/stylesheets/style.less old mode 100755 new mode 100644 index a088397598..6518e1c314 --- a/services/web/public/stylesheets/style.less +++ b/services/web/public/stylesheets/style.less @@ -1,11 +1,26 @@ -@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700); +@import url(https://fonts.googleapis.com/css?family=Lato:300,400,700&subset=latin-ext); @import url(https://fonts.googleapis.com/css?family=Merriweather:400,400i,700,700i); - -@is-overleaf : false; +@is-overleaf : true; @is-overleaf-light : false; -@show-rich-text : false; +@show-rich-text : true; // Core variables and mixins -@import "core/variables.less"; -@import "_style_includes.less"; \ No newline at end of file +@import "core/ol-variables.less"; +@import "app/ol-style-guide.less"; +@import "_style_includes.less"; +@import "_ol_style_includes.less"; +@import "components/embed-responsive.less"; +@import "components/icons.less"; +@import "components/images.less"; +@import "components/navs-ol.less"; +@import "components/pagination.less"; +@import "components/tabs.less"; + +// Pages +@import "app/about.less"; +@import "app/blog-posts.less"; +@import "app/cms-page.less"; +@import "app/content_page.less"; +@import "app/plans-ol.less"; +@import "app/portals.less"; \ No newline at end of file diff --git a/services/web/public/touch-icon-192x192.png b/services/web/public/touch-icon-192x192.png index df869be62c..76cd6acc3e 100644 Binary files a/services/web/public/touch-icon-192x192.png and b/services/web/public/touch-icon-192x192.png differ