Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
T
theme-builder
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
6
Snippets
Groups
Projects
Show more breadcrumbs
Hampus Alstermo
theme-builder
Compare revisions
0.2.1 to 0.2.2
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
hampusalstermo/theme-builder
Select target project
No results found
0.2.2
Select Git revision
Branches
master
Tags
0.0.1
0.0.2
0.0.3
0.0.4
0.1.2
0.1.3
0.2.0
0.2.1
0.2.2
0.2.3
0.2.4
0.2.5
0.2.6
0.2.7
0.2.8
0.2.9
0.3.0
0.3.1
0.3.2
0.3.3
0.3.4
0.3.5
23 results
Swap
Target
hampusalstermo/theme-builder
Select target project
hampusalstermo/theme-builder
1 result
0.2.1
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (1)
0.2.2
· 95f7fab9
Hampus Alstermo
authored
6 years ago
95f7fab9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
composer.json
+1
-1
1 addition, 1 deletion
composer.json
src/Controllers/Customizer.php
+6
-1
6 additions, 1 deletion
src/Controllers/Customizer.php
with
7 additions
and
2 deletions
composer.json
View file @
95f7fab9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"description"
:
"A theme builder for grafikfabriken standard theme"
,
"description"
:
"A theme builder for grafikfabriken standard theme"
,
"type"
:
"library"
,
"type"
:
"library"
,
"license"
:
"GPL-3.0-only"
,
"license"
:
"GPL-3.0-only"
,
"version"
:
"0.2.
1
"
,
"version"
:
"0.2.
2
"
,
"authors"
:
[
"authors"
:
[
{
{
"name"
:
"Hampus Alstermo"
,
"name"
:
"Hampus Alstermo"
,
...
...
This diff is collapsed.
Click to expand it.
src/Controllers/Customizer.php
View file @
95f7fab9
...
@@ -405,7 +405,7 @@ class Customizer extends Singleton{
...
@@ -405,7 +405,7 @@ class Customizer extends Singleton{
$this
->
scss
=
new
Compiler
();
$this
->
scss
=
new
Compiler
();
$this
->
scss
->
addImportPath
(
GF_THEME_BS_DIR
);
$this
->
scss
->
addImportPath
(
GF_THEME_BS_DIR
);
$this
->
scss
->
addImportPath
(
GF_THEME_
FONTAWESOME
_DIR
);
$this
->
scss
->
addImportPath
(
GF_THEME_
BS_SELECT
_DIR
);
$this
->
scss
->
addImportPath
(
GF_THEME_ASSETS_ENTRY_DIR
);
$this
->
scss
->
addImportPath
(
GF_THEME_ASSETS_ENTRY_DIR
);
$result
=
""
;
$result
=
""
;
...
@@ -418,6 +418,7 @@ class Customizer extends Singleton{
...
@@ -418,6 +418,7 @@ class Customizer extends Singleton{
}
catch
(
\Exception
$e
)
{
}
catch
(
\Exception
$e
)
{
//Do something
//Do something
// var_dump($e);
}
}
return
$result
;
return
$result
;
...
@@ -462,12 +463,16 @@ class Customizer extends Singleton{
...
@@ -462,12 +463,16 @@ class Customizer extends Singleton{
$css_file_path
,
$css_file_path
,
$css
$css
);
);
if
(
$result
){
if
(
$result
){
$manage_upload
=
$css_file_url
;
$manage_upload
=
$css_file_url
;
}
}
}
}
if
(
is_string
(
$manage_upload
)
&&
strlen
(
$manage_upload
)
>
0
){
if
(
is_string
(
$manage_upload
)
&&
strlen
(
$manage_upload
)
>
0
){
update_option
(
$this
->
option_name
,
$manage_upload
,
true
);
update_option
(
$this
->
option_name
,
$manage_upload
,
true
);
}
}
...
...
This diff is collapsed.
Click to expand it.