Skip to content

Commit

Permalink
Renamed the .css file into a .less file
Browse files Browse the repository at this point in the history
  • Loading branch information
TheCrowsJoker committed Jan 13, 2015
1 parent d2f2f31 commit 81b1f13
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
9 changes: 8 additions & 1 deletion plugins/Login/Login.php
Expand Up @@ -31,7 +31,8 @@ public function getListHooksRegistered()
'Request.initAuthenticationObject' => 'initAuthenticationObject',
'User.isNotAuthorized' => 'noAccess',
'API.Request.authenticate' => 'ApiRequestAuthenticate',
'AssetManager.getJavaScriptFiles' => 'getJsFiles'
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles'
);
return $hooks;
}
Expand All @@ -41,6 +42,12 @@ public function getJsFiles(&$jsFiles)
$jsFiles[] = "plugins/Login/javascripts/login.js";
}

public function getStylesheetFiles(&$stylesheetFiles)
{
$stylesheetFiles[] = "plugins/Login/stylesheets/login.less";
$stylesheetFiles[] = "plugins/Login/stylesheets/variables.less";

This comment has been minimized.

Copy link
@diosmosis

diosmosis Jan 14, 2015

Member

The variables.less file does not exist in master, this causes core and plugin builds to fail. @mattab What is supposed to be in this file? Please advise.

This comment has been minimized.

Copy link
@mattab

mattab Jan 14, 2015

Member

sorry didnt test properly before merging PR, fixed in #7016

}

/**
* Redirects to Login form with error message.
* Listens to User.isNotAuthorized hook.
Expand Down
Expand Up @@ -60,7 +60,7 @@
}

.loginSection {
background-color: #fafafa;
background-color: @login-section-background;
width: 360px;
padding: 30px;
margin: 50px auto 0 auto;
Expand Down
1 change: 0 additions & 1 deletion plugins/Login/templates/login.twig
Expand Up @@ -9,7 +9,6 @@
{% autoescape false %}
{{ includeAssets({"type": "css"}) }}
{% endautoescape %}
<link rel="stylesheet" type="text/css" href="plugins/Login/stylesheets/login.css"/>
<meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}"/>
<meta name="apple-itunes-app" content="app-id=737216887" />
<meta name="google-play-app" content="app-id=org.piwik.mobile2">
Expand Down
2 changes: 1 addition & 1 deletion plugins/Morpheus/stylesheets/simple_structure.css
Expand Up @@ -2,7 +2,7 @@ body#simple {
background: #eee;
}
#contentsimple {
background: @theme-color-background-base;
background: #fff;
color: #000;
font-family: Arial, Georgia, "Times New Roman", Times, serif;
padding: 1em 2em;
Expand Down

0 comments on commit 81b1f13

Please sign in to comment.