Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MyFridge
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
Container Registry
Model registry
Operate
Environments
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rosemary
MyFridge
Commits
257c59e7
Commit
257c59e7
authored
6 years ago
by
Explorerose
Browse files
Options
Downloads
Patches
Plain Diff
added
parent
a3099f7a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.idea/workspace.xml
+43
-19
43 additions, 19 deletions
.idea/workspace.xml
Interface/style.css
+16
-0
16 additions, 0 deletions
Interface/style.css
Interface/welcome page.html
+20
-8
20 additions, 8 deletions
Interface/welcome page.html
with
79 additions
and
27 deletions
.idea/workspace.xml
+
43
−
19
View file @
257c59e7
...
...
@@ -2,7 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"1d6634ec-b7ad-4ab3-b01a-3030dcab967e"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/Interface/style.css"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Interface/style.css"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Interface/style.css"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Interface/welcome page.html"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Interface/welcome page.html"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -21,25 +22,27 @@
<usages-collector
id=
"statistics.file.extensions.open"
>
<counts>
<entry
key=
"css"
value=
"2"
/>
<entry
key=
"html"
value=
"
2
"
/>
<entry
key=
"html"
value=
"
3
"
/>
<entry
key=
"java"
value=
"2"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.types.open"
>
<counts>
<entry
key=
"CSS"
value=
"2"
/>
<entry
key=
"HTML"
value=
"
2
"
/>
<entry
key=
"HTML"
value=
"
3
"
/>
<entry
key=
"JAVA"
value=
"2"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.extensions.edit"
>
<counts>
<entry
key=
"css"
value=
"1"
/>
<entry
key=
"css"
value=
"187"
/>
<entry
key=
"html"
value=
"50"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.types.edit"
>
<counts>
<entry
key=
"CSS"
value=
"1"
/>
<entry
key=
"CSS"
value=
"187"
/>
<entry
key=
"HTML"
value=
"50"
/>
</counts>
</usages-collector>
</session>
...
...
@@ -55,6 +58,15 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/Interface/welcome page.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"274"
>
<caret
line=
"32"
column=
"32"
selection-start-line=
"32"
selection-start-column=
"32"
selection-end-line=
"32"
selection-end-column=
"32"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/Java codes/src/Main.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -67,8 +79,8 @@
<file
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/Interface/style.css"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
17
"
>
<caret
line=
"
1
"
column=
"2
2
"
selection-start-line=
"
1
"
selection-start-column=
"2
2
"
selection-end-line=
"
1
"
selection-end-column=
"2
2
"
/>
<state
relative-caret-position=
"
344
"
>
<caret
line=
"
23
"
column=
"2
3
"
selection-start-line=
"
23
"
selection-start-column=
"2
3
"
selection-end-line=
"
23
"
selection-end-column=
"2
3
"
/>
</state>
</provider>
</entry>
...
...
@@ -89,6 +101,7 @@
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/Login_v13/welcome page.html"
/>
<option
value=
"$PROJECT_DIR$/Interface/welcome page.html"
/>
<option
value=
"$PROJECT_DIR$/Interface/style.css"
/>
</list>
</option>
...
...
@@ -128,6 +141,10 @@
<item
name=
"MyFridge"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"Java codes"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"MyFridge"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"Scratches and Consoles"
type=
"1a2a3e82:ScratchProjectViewPane$MyProjectNode"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -139,7 +156,7 @@
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"aspect.path.notification.shown"
value=
"true"
/>
<property
name=
"com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp"
value=
"15485
18968294
"
/>
<property
name=
"com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp"
value=
"15485
22381458
"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$"
/>
<property
name=
"nodejs_interpreter_path.stuck_in_default_project"
value=
"undefined stuck path"
/>
<property
name=
"nodejs_npm_path_reset_for_default_project"
value=
"true"
/>
...
...
@@ -166,12 +183,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1548511002627
</updated>
<workItem
from=
"1548511007288"
duration=
"
1913
000"
/>
<workItem
from=
"1548511007288"
duration=
"
3964
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
1913
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
3964
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"16"
y=
"23"
width=
"1264"
height=
"777"
extended-state=
"0"
/>
...
...
@@ -213,13 +230,6 @@
<option
name=
"myLimit"
value=
"2678400000"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/Java codes/src/Item.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"310"
>
<caret
line=
"26"
selection-start-line=
"26"
selection-end-line=
"26"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Login_v13/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state>
...
...
@@ -239,6 +249,13 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Java codes/src/Item.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"310"
>
<caret
line=
"26"
selection-start-line=
"26"
selection-end-line=
"26"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Java codes/src/Main.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"119"
>
...
...
@@ -246,10 +263,17 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Interface/welcome page.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"274"
>
<caret
line=
"32"
column=
"32"
selection-start-line=
"32"
selection-start-column=
"32"
selection-end-line=
"32"
selection-end-column=
"32"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Interface/style.css"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
17
"
>
<caret
line=
"
1
"
column=
"2
2
"
selection-start-line=
"
1
"
selection-start-column=
"2
2
"
selection-end-line=
"
1
"
selection-end-column=
"2
2
"
/>
<state
relative-caret-position=
"
344
"
>
<caret
line=
"
23
"
column=
"2
3
"
selection-start-line=
"
23
"
selection-start-column=
"2
3
"
selection-end-line=
"
23
"
selection-end-column=
"2
3
"
/>
</state>
</provider>
</entry>
...
...
This diff is collapsed.
Click to expand it.
Interface/style.css
+
16
−
0
View file @
257c59e7
...
...
@@ -9,4 +9,20 @@ body {
h1
{
color
:
navy
;
margin-left
:
20px
;
}
#button1
{
position
:
fixed
;
left
:
45%
;
top
:
55%
;
}
#button2
{
position
:
fixed
;
left
:
55%
;
top
:
45%
;
}
.inside_inline
{
text-align
:
center
;
}
.inside_inline
button
{
display
:
inline
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Interface/welcome page.html
+
20
−
8
View file @
257c59e7
...
...
@@ -3,24 +3,36 @@
<head>
<style>
body
{
background-color
:
lightblue
;
<link
rel="stylesheet"
type="text/css"
href="style.css">
}
h1
{
color
:
white
;
font-family
:
Palantino
;
text-align
:
center
;
font-size
:
40px
;
}
p
{
font-family
:
verdan
a
;
p
1
{
font-family
:
helvetic
a
;
font-size
:
20px
;
}
</style>
</head>
<body>
<h1>
Welcome to My Fridge
</h1>
<p1>
My Fridge is a website designed to connect students from the same community to share food and recipes so as to
<ol>
<li>
Reduce food waste
</li>
<li>
Provide a platform for students to interact with other students
</li>
<li>
Reduce time for food preparation
</li>
</ol>
So what are you waiting for? Connect with your community now!
</p1>
<br>
<h1>
My First CSS Example
</h1>
<p>
This is a paragraph.
</p>
<div
class=
"center inside_inline"
>
<button
id=
"button1"
>
Register
</button>
<button>
Login
</button>
</div>
</body>
</html>
</html>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment