Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6163bd67 authored by Adam Tauber's avatar Adam Tauber Committed by GitHub
Browse files

Merge pull request #1954 from return42/csp-oscar-theme 

[fix] oscar theme, remove inline style attributes (CSP compliants)
parents c59ca600 f14a7add

Makefile

+6 −6
Original line number Original line Diff line number Diff line
@@ -164,29 +164,29 @@ quiet_cmd_grunt = GRUNT $2 
      cmd_grunt = PATH="$$(npm bin):$$PATH" \

      cmd_grunt = PATH="$$(npm bin):$$PATH" \

	grunt --gruntfile  "$2"

	grunt --gruntfile  "$2"





themes.oscar:

themes.oscar: node.env

	$(Q)echo '[!] build oscar theme'

	$(Q)echo '[!] build oscar theme'

	$(call cmd,grunt,searx/static/themes/oscar/gruntfile.js)

	$(call cmd,grunt,searx/static/themes/oscar/gruntfile.js)





themes.simple:

themes.simple: node.env

	$(Q)echo '[!] build simple theme'

	$(Q)echo '[!] build simple theme'

	$(call cmd,grunt,searx/static/themes/simple/gruntfile.js)

	$(call cmd,grunt,searx/static/themes/simple/gruntfile.js)





themes.legacy:

themes.legacy: node.env

	$(Q)echo '[!] build legacy theme'

	$(Q)echo '[!] build legacy theme'

	$(call cmd,lessc,themes/legacy/less/style-rtl.less,themes/legacy/css/style-rtl.css)

	$(call cmd,lessc,themes/legacy/less/style-rtl.less,themes/legacy/css/style-rtl.css)

	$(call cmd,lessc,themes/legacy/less/style.less,themes/legacy/css/style.css)

	$(call cmd,lessc,themes/legacy/less/style.less,themes/legacy/css/style.css)





themes.courgette:

themes.courgette: node.env

	$(Q)echo '[!] build courgette theme'

	$(Q)echo '[!] build courgette theme'

	$(call cmd,lessc,themes/courgette/less/style.less,themes/courgette/css/style.css)

	$(call cmd,lessc,themes/courgette/less/style.less,themes/courgette/css/style.css)

	$(call cmd,lessc,themes/courgette/less/style-rtl.less,themes/courgette/css/style-rtl.css)

	$(call cmd,lessc,themes/courgette/less/style-rtl.less,themes/courgette/css/style-rtl.css)





themes.pixart:

themes.pixart: node.env

	$(Q)echo '[!] build pixart theme'

	$(Q)echo '[!] build pixart theme'

	$(call cmd,lessc,themes/pix-art/less/style.less,themes/pix-art/css/style.css)

	$(call cmd,lessc,themes/pix-art/less/style.less,themes/pix-art/css/style.css)





themes.bootstrap:

themes.bootstrap: node.env

	$(call cmd,lessc,less/bootstrap/bootstrap.less,css/bootstrap.min.css)

	$(call cmd,lessc,less/bootstrap/bootstrap.less,css/bootstrap.min.css)

searx/static/themes/oscar/css/logicodev-dark.css

+9 −0
Original line number Original line Diff line number Diff line
@@ -763,3 +763,12 @@ code { 
.table > tbody > tr > th {

.table > tbody > tr > th {

  vertical-align: middle !important;

  vertical-align: middle !important;

}

}

.nav-tabs.nav-justified {

  margin-bottom: 20px;

}

p {

  margin: 10px 0;

}

input.cursor-text {

  margin: 10px 0;

}

searx/static/themes/oscar/css/logicodev.css

+9 −0
Original line number Original line Diff line number Diff line
@@ -736,6 +736,15 @@ code { 
.table > tbody > tr > th {

.table > tbody > tr > th {

  vertical-align: middle !important;

  vertical-align: middle !important;

}

}

.nav-tabs.nav-justified {

  margin-bottom: 20px;

}

p {

  margin: 10px 0;

}

input.cursor-text {

  margin: 10px 0;

}

/*Global*/

/*Global*/

body {

body {

  background: #1d1f21 none !important;

  background: #1d1f21 none !important;

searx/static/themes/oscar/css/logicodev.min.css

+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View original file
View changed file