Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dai make css local #23

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Dai make css local #23

wants to merge 6 commits into from

Conversation

CODZR
Copy link
Contributor

@CODZR CODZR commented Apr 13, 2020

戴泽荣 201732120115 make css file localization

@spm2020spring
Copy link
Member

@dzr201732120115

Make a smaller pull request next time.

Make many pull requests if you have many updates.

Hui

spm2020spring
spm2020spring reviewed Apr 13, 2020
View reviewed changes
Connect.php
Comment on lines +2 to +23
//$servername = "localhost";
//$username = "root";
//$password = "";
//
//
//// $servername = "sql202.epizy.com";
//// $username = "epiz_23626301";
//// $password = "wtn2rmj3";
//// Create connection
//$con = new mysqli($servername, $username, $password,'lrr');
//
//// Check connection
//if ($con->connect_error) {
// die("Database Connection failed: " . $conn->connect_error);
//}
//// else
//// {
//
//// echo "Connected";
//// }
//session_start();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why comment out these?

If I merge these changes, then it would break the current build.

Hui

spm2020spring
spm2020spring reviewed Apr 13, 2020
View reviewed changes
Header.php
@@ -27,10 +27,11 @@
<header>


<link href="css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="http://118.25.96.118/nor/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why add "http://118.25.96.118/nor/"? I think this would not make any difference.

Hui

spm2020spring
spm2020spring reviewed Apr 13, 2020
View reviewed changes
Header.php

<!--<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/> -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css" />
<!--<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css" />-->
<link rel="stylesheet" href="./webfonts/all.min.css" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

You created a new folder called webfonts?

Is all.min.css the same as fontawesome.min.css ?

Hui

spm2020spring
spm2020spring reviewed Apr 13, 2020
View reviewed changes
README.md
### Steps of local test deployment
1.download **xampp** <br>
2.follow the website to do:
> https://blog.csdn.net/qing666888/article/details/81914389 <br>
Copy link
Member

@spm2020spring spm2020spring Apr 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why do you append <br> in the end of sentence?

Hui

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

spm2020spring
spm2020spring reviewed Apr 13, 2020
View reviewed changes
Script.php
@@ -396,7 +396,7 @@
header("Location: Admin.php");

} else {
echo "Error: " . $sql . "<br>" . $conn->error;
echo "Error: " . $sql . "<br>" . $con->error;
Copy link
Member

@spm2020spring spm2020spring Apr 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why did you change conn to con?

Hui

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email •
edited by spm2020spring
Loading

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email •
edited by spm2020spring
Loading

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

spm2020spring
spm2020spring reviewed Apr 13, 2020
View reviewed changes
Copy link
Member

@spm2020spring spm2020spring left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Could you make another branch called Dai-MakeCssLocal2? Make sure this branch has exactly the same content as the central master repo (https://github.com/lanlab-org/LRR).

In this branch Dai-MakeCssLocal2, could you replace href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css" with href="./font-awesome/css/all.min.css" on line 33 of Header.php?

Make sure you put all.min.css in the folder font-awesome/css.

Just make this single change and push Dai-MakeCssLocal2.

Thanks

Hui

@spm2020spring
Copy link
Member

https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css

@dzr201732120115

下面这个链接虽然能够打开，但是会导致我登录LRR时加载课程列表变慢很多（体验不好），因为LRR要首先到cdnjs.cloudflare.com网站加载这个fontawesome.min.css。

https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css

蓝珲

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@spm2020spring
Copy link
Member

spm2020spring commented Apr 13, 2020 •
edited
Loading

conn报错，上面声明的也是con，没有conn，报错了总不能是故意的吧------------------ 原始邮件 ------------------ 发件人: "Software Project Management"notifications@github.com 发送时间: 2020年4月13日(星期一) 晚上6:24 收件人: "lanlab-org/LRR"LRR@noreply.github.com; 抄送: "dzr201732120115"975336710@qq.com;"Mention"mention@noreply.github.com; 主题: Re: [lanlab-org/LRR] Dai make css local (#23) @spm2020spring commented on this pull request. In Script.php: @@ -396,7 +396,7 @@ header("Location: Admin.php"); } else { - echo "Error: " . conn->error; + echo "Error: " . con->error; @dzr201732120115 What did you change conn to con? Hui — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

@dzr201732120115

你克隆下来的版本中Script.php有conn吗？可能你克隆的版本不对啊。你看下面的链接，lanlab-org下面的LRR是没有conn的。

https://github.com/lanlab-org/LRR/blob/Ashly-Tafadzwa-Dhani-201632120150-Contributor_List/Script.php

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@spm2020spring
Copy link
Member

@dzr201732120115

FYI

现在运行LRR的网站上，有font-awesome文件夹，它的结构如下。因为是第三方的库，我们的仓库没有必要放它。

font-awesome/less/fixed-width.less font-awesome/less/larger.less font-awesome/less/rotated-flipped.less font-awesome/less/font-awesome.less font-awesome/less/path.less font-awesome/less/list.less font-awesome/less/variables.less font-awesome/less/icons.less font-awesome/less/core.less font-awesome/less/bordered-pulled.less font-awesome/less/spinning.less font-awesome/less/stacked.less font-awesome/less/mixins.less font-awesome/less font-awesome/css/font-awesome.css font-awesome/css/font-awesome.min.css font-awesome/css font-awesome/fonts/fontawesome-webfont.woff font-awesome/fonts/fontawesome-webfont.ttf font-awesome/fonts/fontawesome-webfont.eot font-awesome/fonts/FontAwesome.otf font-awesome/fonts/fontawesome-webfont.svg font-awesome/fonts font-awesome/scss/_core.scss font-awesome/scss/_fixed-width.scss font-awesome/scss/_rotated-flipped.scss font-awesome/scss/_bordered-pulled.scss font-awesome/scss/_mixins.scss font-awesome/scss/font-awesome.scss font-awesome/scss/_list.scss font-awesome/scss/_variables.scss font-awesome/scss/_stacked.scss font-awesome/scss/_spinning.scss font-awesome/scss/_path.scss font-awesome/scss/_larger.scss font-awesome/scss/_icons.scss font-awesome/scss

蓝珲

其实我本来也是想把它放在css文件里，但是因为那个相对引用是all.min.css文件里的，具体是.. /fo-solid，也就是说fa-solid要在all. min. css文件的上一级目录文件内能找到，如果把它放在css/all.min.css，那么它的上一级目录css/下就找不到fo-solid------------------ 原始邮件 ------------------ 发件人: "Software Project Management"notifications@github.com 发送时间: 2020年4月13日(星期一) 晚上6:43 收件人: "lanlab-org/LRR"LRR@noreply.github.com; 抄送: "dzr201732120115"975336710@qq.com;"Mention"mention@noreply.github.com; 主题: Re: [lanlab-org/LRR] Dai make css local (#23) @spm2020spring commented on this pull request. @dzr201732120115 Could you make another branch called Dai-MakeCssLocal2? Make sure this branch has exactly the same content as the central master repo (https://github.com/lanlab-org/LRR). In this branch Dai-MakeCssLocal2, could you replace href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css" with href="./font-awesome/css/all.min.css" on line 33 of Header.php? Make sure you put all.min.css in the folder font-awesome/css. Just make this single change and push Dai-MakeCssLocal2. Thanks Hui — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

@dzr201732120115

FYI

现在运行LRR的网站上，有font-awesome文件夹，它的结构如下。因为是第三方的库，我们的仓库没有必要放它。

font-awesome/less/fixed-width.less font-awesome/less/larger.less font-awesome/less/rotated-flipped.less font-awesome/less/font-awesome.less font-awesome/less/path.less font-awesome/less/list.less font-awesome/less/variables.less font-awesome/less/icons.less font-awesome/less/core.less font-awesome/less/bordered-pulled.less font-awesome/less/spinning.less font-awesome/less/stacked.less font-awesome/less/mixins.less font-awesome/less font-awesome/css/font-awesome.css font-awesome/css/font-awesome.min.css font-awesome/css font-awesome/fonts/fontawesome-webfont.woff font-awesome/fonts/fontawesome-webfont.ttf font-awesome/fonts/fontawesome-webfont.eot font-awesome/fonts/FontAwesome.otf font-awesome/fonts/fontawesome-webfont.svg font-awesome/fonts font-awesome/scss/_core.scss font-awesome/scss/_fixed-width.scss font-awesome/scss/_rotated-flipped.scss font-awesome/scss/_bordered-pulled.scss font-awesome/scss/_mixins.scss font-awesome/scss/font-awesome.scss font-awesome/scss/_list.scss font-awesome/scss/_variables.scss font-awesome/scss/_stacked.scss font-awesome/scss/_spinning.scss font-awesome/scss/_path.scss font-awesome/scss/_larger.scss font-awesome/scss/_icons.scss font-awesome/scss

蓝珲

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

@CODZR
Copy link
Contributor Author

CODZR commented Apr 13, 2020 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spm2020spring spm2020spring spm2020spring left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@CODZR @spm2020spring